9 Commits

Author SHA1 Message Date
c00037d3f6 Migrate to GitLab 2022-03-11 16:43:49 +00:00
renovate[bot]
c6a578b5bb Update actions/stale action to v4 (#146)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2021-10-18 20:41:29 +01:00
dependabot[bot]
f7ce7cd401 ⬆️ Bump phpseclib/phpseclib from 2.0.28 to 2.0.31 in /app (#142)
Bumps [phpseclib/phpseclib](https://github.com/phpseclib/phpseclib) from 2.0.28 to 2.0.31.
- [Release notes](https://github.com/phpseclib/phpseclib/releases)
- [Changelog](https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md)
- [Commits](https://github.com/phpseclib/phpseclib/compare/2.0.28...2.0.31)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2021-04-20 22:26:31 +01:00
18cdccb63e Update Docker registry 2021-03-06 16:46:10 +00:00
bb3143c7c8 Update Docker registry 2021-03-06 16:44:29 +00:00
80679499e1 Update docker-compose config location (#141) 2020-10-23 10:37:55 +01:00
renovate[bot]
23bf431c74 Update actions/stale action to v3 (#139)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-10-23 10:27:16 +01:00
renovate[bot]
4bced68a09 Update dependency sentry/sdk to v3 (#138)
Co-authored-by: Renovate Bot <bot@renovateapp.com>
2020-09-28 19:26:51 +01:00
Alexander Davis
4d3ace9d67 Update deploy.yml (#137) 2020-09-08 22:16:27 +01:00
16 changed files with 456 additions and 516 deletions

View File

@@ -0,0 +1,39 @@
name: Deploy
on:
push:
branches: main
jobs:
release-on-push:
runs-on: ubuntu-latest
outputs:
ver: ${{ steps.release.outputs.version }}
tag: ${{ steps.release.outputs.tag_name }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- name: Get Release
id: release
uses: rymndhng/release-on-push-action@master
with:
bump_version_scheme: patch
- name: Check Release Output
id: rop-check
run: |
echo "Got tag name ${{ steps.release.outputs.tag_name }}"
echo "Got release version ${{ steps.release.outputs.version }}"
build:
name: GitHub Container Registry
runs-on: ubuntu-latest
needs: [prepare-data]
steps:
- uses: actions/checkout@v2
- name: Login to GitHub Container Registry
run: echo ${{ secrets.PAT }} | docker login ghcr.io -u luketainton --password-stdin
- name: Build image for GitHub Container Registry
run: docker build . --file Dockerfile --tag ghcr.io/luketainton/fhed:${{ needs.release-on-push.outputs.ver }} --tag ghcr.io/luketainton/fhed:latest
- name: Push image to GitHub Container Registry
run: |
docker push ghcr.io/luketainton/fhed:latest
docker push ghcr.io/luketainton/fhed:${{ needs.release-on-push.outputs.ver }}

View File

@@ -10,7 +10,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/stale@v1 - uses: actions/stale@v4
with: with:
repo-token: ${{ secrets.GITHUB_TOKEN }} repo-token: ${{ secrets.GITHUB_TOKEN }}
stale-issue-message: 'This issue has been marked as stale due to inactivity. If this issue is still ongoing, please leave a comment.' stale-issue-message: 'This issue has been marked as stale due to inactivity. If this issue is still ongoing, please leave a comment.'

View File

@@ -1,67 +0,0 @@
name: Deploy
on:
push:
branches: main
jobs:
release-on-push:
runs-on: ubuntu-latest
outputs:
ver: ${{ steps.release.outputs.version }}
tag: ${{ steps.release.outputs.tag_name }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- id: release
uses: rymndhng/release-on-push-action@master
with:
bump_version_scheme: minor
- name: Check Output Parameters
run: |
echo "Got tag name ${{ steps.release.outputs.tag_name }}"
echo "Got release version ${{ steps.release.outputs.version }}"
docker-dh:
name: Push to Docker Hub
needs: [release-on-push]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Login to DockerHub Registry
run: echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USERNAME }} --password-stdin
- name: Build image for Docker Hub
run: docker build . --file Dockerfile --build-arg VERSION=${{ needs.release-on-push.outputs.ver }} --tag luketainton/fhed:${{ needs.release-on-push.outputs.tag }} --tag luketainton/fhed:latest
- name: Push image to Docker Hub
run: |
docker push luketainton/fhed:${{ needs.release-on-push.outputs.tag }} &&
docker push luketainton/fhed:latest
docker-ghr:
name: Push to GitHub Package Registry
needs: [release-on-push]
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- name: Login to DockerHub Registry
run: echo ${{ secrets.GITHUB_TOKEN }} | docker login https://docker.pkg.github.com -u luketainton --password-stdin
- name: Build image for GitHub Package Registry
run: docker build . --file Dockerfile --build-arg VERSION=${{ needs.release-on-push.outputs.ver }} --tag docker.pkg.github.com/luketainton/fhed/fhed:latest --tag docker.pkg.github.com/luketainton/fhed/fhed:${{ needs.release-on-push.outputs.tag }}
- name: Push image to GitHub Package Registry
run: |
docker push docker.pkg.github.com/luketainton/fhed/fhed:${{ needs.release-on-push.outputs.tag }} &&
docker push docker.pkg.github.com/luketainton/fhed/fhed:latest
deploy:
name: Update Docker image on server
runs-on: ubuntu-latest
needs: [docker-dh]
steps:
- name: Update image on server
uses: garygrossgarten/github-action-ssh@release
with:
command: cd /docker/active/fhed && docker-compose pull && docker-compose up -d
host: ${{ secrets.SSH_HOST }}
port: ${{ secrets.SSH_PORT }}
username: ${{ secrets.SSH_USERNAME }}
privateKey: ${{ secrets.SSH_SSHKEY }}

18
.gitlab-ci.yml Normal file
View File

@@ -0,0 +1,18 @@
stages:
- build
build:
stage: build
only:
- tags
image: docker:19.03.12
services:
- docker:19.03.12-dind
variables:
IMAGE_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- docker build -t $CI_REGISTRY_IMAGE:latest -t $IMAGE_TAG .
- docker build -t $IMAGE_TAG -t $CI_REGISTRY_IMAGE:latest .
- docker push $IMAGE_TAG
- docker push $CI_REGISTRY_IMAGE:latest

View File

@@ -4,6 +4,7 @@ RUN composer --working-dir=/srv install
FROM php:apache FROM php:apache
LABEL maintainer="Luke Tainton <luke@tainton.uk>" LABEL maintainer="Luke Tainton <luke@tainton.uk>"
LABEL org.opencontainers.image.source="https://github.com/luketainton/fhed"
ARG VERSION ARG VERSION
RUN docker-php-ext-install pdo_mysql && a2enmod rewrite remoteip RUN docker-php-ext-install pdo_mysql && a2enmod rewrite remoteip
COPY vhost.conf /etc/apache2/sites-enabled/000-default.conf COPY vhost.conf /etc/apache2/sites-enabled/000-default.conf

View File

@@ -3,6 +3,6 @@
"ramsey/uuid": "^4.0", "ramsey/uuid": "^4.0",
"vlucas/phpdotenv": "^5.0", "vlucas/phpdotenv": "^5.0",
"jumbojett/openid-connect-php": "^0.9.0", "jumbojett/openid-connect-php": "^0.9.0",
"sentry/sdk": "^2.1" "sentry/sdk": "^3.0"
} }
} }

843
app/composer.lock generated

File diff suppressed because it is too large Load Diff