From 236fbf03fee4796d98da805c37974fe877cb1802 Mon Sep 17 00:00:00 2001 From: Grant Bevis Date: Wed, 29 Dec 2021 08:22:29 +0000 Subject: [PATCH] Added GHA and switching to main branch as default. Also set /etc/ssh to be a volume --- .github/dependabot.yml | 10 +++++ .github/workflows/build_latest.yml | 51 +++++++++++++++++++++ .github/workflows/build_new_version.yml | 60 +++++++++++++++++++++++++ Dockerfile | 3 +- 4 files changed, 123 insertions(+), 1 deletion(-) create mode 100644 .github/dependabot.yml create mode 100644 .github/workflows/build_latest.yml create mode 100644 .github/workflows/build_new_version.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..3eb2e87 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,10 @@ +# Set update schedule for GitHub Actions + +version: 2 +updates: + + - package-ecosystem: "github-actions" + directory: "/" + schedule: + # Check for updates to GitHub Actions every weekday + interval: "daily" \ No newline at end of file diff --git a/.github/workflows/build_latest.yml b/.github/workflows/build_latest.yml new file mode 100644 index 0000000..e9f32a8 --- /dev/null +++ b/.github/workflows/build_latest.yml @@ -0,0 +1,51 @@ +--- +name: 'Build PHP Latest Images' + +on: + push: + branches: + - main + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Prepare Image Build + id: prep_image + run: | + DOCKER_IMAGE=ghcr.io/${{ github.actor }}/borg-server + TAG="${DOCKER_IMAGE}:latest" + + # Set output parameters. + echo ::set-output name=tags::${TAG} + echo ::set-output name=docker_image::${DOCKER_IMAGE} + + - name: Set up QEMU + uses: docker/setup-qemu-action@master + with: + platforms: linux/amd64,linux/arm64 +# platforms: all + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@master + + - name: Log in to the GitHub Container registry + if: github.event_name != 'pull_request' + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build Image + uses: docker/build-push-action@v2 + with: + builder: ${{ steps.buildx.outputs.name }} + context: . + platforms: linux/amd64,linux/arm64 + push: true + tags: ${{ steps.prep_image.outputs.tags }} diff --git a/.github/workflows/build_new_version.yml b/.github/workflows/build_new_version.yml new file mode 100644 index 0000000..45b4aba --- /dev/null +++ b/.github/workflows/build_new_version.yml @@ -0,0 +1,60 @@ +--- +name: 'Build Versioned Images' + +on: + push: + tags: + - v* + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v2 + + - name: Prepare Image Build + id: prep_image + run: | + DOCKER_IMAGE=${{ github.actor }}/borg-server + VERSION=latest + # If this is git tag, use the tag name as a docker tag + if [[ $GITHUB_REF == refs/tags/* ]]; then + VERSION=${GITHUB_REF#refs/tags/v} + fi + TAGS="${DOCKER_IMAGE}:${VERSION}" + # If the VERSION looks like a version number, assume that + # this is the most recent version of the image and also + # tag it 'latest'. + if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}-[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then + TAGS="$TAGS,"${DOCKER_IMAGE}":latest" + fi + # Set output parameters. + echo ::set-output name=tags::${TAGS} + echo ::set-output name=docker_image::${DOCKER_IMAGE} + + - name: Set up QEMU + uses: docker/setup-qemu-action@master + with: + platforms: all + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@master + + - name: Log in to the GitHub Container registry + if: github.event_name != 'pull_request' + uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Build PHP-FPM + uses: docker/build-push-action@v2 + with: + builder: ${{ steps.buildx.outputs.name }} + context: . + platforms: linux/amd64,linux/arm64 + push: true + tags: ${{ steps.prep_image.outputs.tags }} diff --git a/Dockerfile b/Dockerfile index 73d4bdc..2896170 100755 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ FROM alpine:latest MAINTAINER b3vis #Install Borg & SSH -RUN apk add openssh sshfs borgbackup supervisor --no-cache +RUN apk add openssh sshfs borgbackup supervisor RUN adduser -D -u 1000 borg && \ mkdir /backups && \ chown borg.borg /backups && \ @@ -13,4 +13,5 @@ COPY supervisord.conf /etc/supervisord.conf COPY service.sh /usr/local/bin/service.sh RUN passwd -u borg EXPOSE 22 +VOLUME /etc/ssh CMD ["/usr/bin/supervisord"]