From 045d3a65e4309fee66da0781a24bbbc180661d1f Mon Sep 17 00:00:00 2001 From: Christian Richter Date: Thu, 12 May 2022 11:31:48 +0200 Subject: [PATCH] clean up Signed-off-by: Christian Richter --- .drone.star | 75 ++++++++++++++++++++++-------- .github/workflows/docker-image.yml | 43 ----------------- .github/workflows/ghrunner.yml | 42 ----------------- README.md | 9 ++-- ghrunner/Dockerfile | 16 ------- ghrunner/README.md | 21 --------- ghrunner/entrypoint.sh | 30 ------------ motsognir/Dockerfile | 2 +- webtest/Dockerfile | 6 +-- 9 files changed, 63 insertions(+), 181 deletions(-) delete mode 100644 .github/workflows/docker-image.yml delete mode 100644 .github/workflows/ghrunner.yml delete mode 100644 ghrunner/Dockerfile delete mode 100644 ghrunner/README.md delete mode 100755 ghrunner/entrypoint.sh diff --git a/.drone.star b/.drone.star index 15a9f2b..c23fa03 100644 --- a/.drone.star +++ b/.drone.star @@ -1,38 +1,55 @@ def main(ctx): return [ - stepPR("amd64"), - stepPR("arm64"), - stepMergeMaster("amd64"), - stepMergeMaster("arm64"), + stepPR("amd64", "motsognir"), + #stepPR("arm64", "motsognir"), + #stepMergeMaster("amd64", "motsognir"), + #stepMergeMaster("arm64", "motsognir"), + + stepPR("amd64", "webtest"), + #stepPR("arm64", "webtest"), + #stepMergeMaster("amd64", "webtest"), + #stepMergeMaster("arm64", "webtest"), ] -def stepPR(arch): +def stepPR(arch, path): return { "kind": "pipeline", "type": "docker", - "name": "docker-build-%s" % (arch), + "name": "docker-build-%s-%s" % (path, arch), "platform": { "os": "linux", "arch": arch, }, "steps": [ { - "name": "build-image-%s" % (arch), + "name": "build-image-%s-%s" % (path, arch), "image": "plugins/docker", "settings": { - "dockerfile": "motsognir/Dockerfile", - "repo": "dragonchaser/motsognir", + "dockerfile": "%s/Dockerfile" % (path), + "repo": "dragonchaser/%s" % (path), "dry_run": "true", "tag": "latest-%s" % (arch), - "username": { - "from_secret": "dockerhub-user" - }, - "password": { - "from_secret": "dockerhub-password" - } } }, + { + "name": "notify-build-%s-%s" % (path, arch), + "image": "plugins/matrix", + "settings": { + "homeserver": { + "from_secret": "matrix-homerserver" + }, + "roomid": { + "from_secret": "matrix-room" + }, + "username": { + "from_secret": "matrix-user" + }, + "password": { + "from_secret": "matrix-password" + } + } + }, ], "trigger": { "ref": [ @@ -41,22 +58,22 @@ def stepPR(arch): }, } -def stepMergeMaster(arch): +def stepMergeMaster(arch, path): return { "kind": "pipeline", "type": "docker", - "name": "docker-publish-%s" % (arch), + "name": "docker-publish-%s-%s" % (path, arch), "platform": { "os": "linux", "arch": arch, }, "steps": [ { - "name": "build-build-and-publish-image-%s" % (arch), + "name": "build-and-publish-image-%s-%s" % (path, arch), "image": "plugins/docker", "settings": { - "dockerfile": "motsognir/Dockerfile", - "repo": "dragonchaser/motsognir", + "dockerfile": "%s/Dockerfile" % (path), + "repo": "dragonchaser/%s" % (path), "dry_run": "false", "tag": "latest-%s" % (arch), "username": { @@ -67,6 +84,24 @@ def stepMergeMaster(arch): } } }, + { + "name": "notify-publish-%s-%s" % (path, arch), + "image": "plugins/matrix", + "settings": { + "homeserver": { + "from_secret": "matrix-homerserver" + }, + "roomid": { + "from_secret": "matrix-room" + }, + "username": { + "from_secret": "matrix-user" + }, + "password": { + "from_secret": "matrix-password" + } + } + }, ], "trigger": { "ref": [ diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml deleted file mode 100644 index b98827a..0000000 --- a/.github/workflows/docker-image.yml +++ /dev/null @@ -1,43 +0,0 @@ -name: Docker Image CI - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - - build: - - runs-on: ubuntu-latest - env: - DOCKER_REGISTRY: ghcr.io - DOCKER_IMAGE: dragonchaser/motsognir - DOCKER_TARGET_PLATFORM: "linux/arm/v7,linux/arm64,linux/amd64" - - steps: - - uses: actions/checkout@v2 - - - name: Set up Docker Buildx - uses: crazy-max/ghaction-docker-buildx@v1 - with: - version: latest - - - name: Prepare - if: success() - id: prepare - run: | - echo ::set-output name=docker_platform::${DOCKER_TARGET_PLATFORM} - echo ::set-output name=docker_image::${DOCKER_REGISTRY}/${DOCKER_IMAGE} - #echo ::set-output name=version::${GITHUB_RUN_NUMBER} - echo ::set-output name=version::latest - - - name: Log into registry - run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - - - name: Run Buildx - if: success() - run: | - cd motsognir - docker buildx build --platform ${{ steps.prepare.outputs.docker_platform }} --tag ${{ steps.prepare.outputs.docker_image }}:${{steps.prepare.outputs.version }} --file ./Dockerfile.arm32v7 --output type=image,push=true . diff --git a/.github/workflows/ghrunner.yml b/.github/workflows/ghrunner.yml deleted file mode 100644 index c9b84bf..0000000 --- a/.github/workflows/ghrunner.yml +++ /dev/null @@ -1,42 +0,0 @@ -name: Docker Image CI for GHRUNNER - -on: - push: - branches: [ master ] - pull_request: - branches: [ master ] - -jobs: - - build: - - runs-on: ubuntu-latest - env: - DOCKER_REGISTRY: ghcr.io - DOCKER_IMAGE: dragonchaser/ghrunner - DOCKER_TARGET_PLATFORM: "linux/arm64,linux/amd64" - - steps: - - uses: actions/checkout@v2 - - - name: Set up Docker Buildx - uses: crazy-max/ghaction-docker-buildx@v1 - with: - version: latest - - - name: Prepare - if: success() - id: prepare - run: | - echo ::set-output name=docker_platform::${DOCKER_TARGET_PLATFORM} - echo ::set-output name=docker_image::${DOCKER_REGISTRY}/${DOCKER_IMAGE} - echo ::set-output name=version::latest - - - name: Log into registry - run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin - - - name: Run Buildx - if: success() - run: | - cd ghrunner - docker buildx build --platform ${{ steps.prepare.outputs.docker_platform }} --tag ${{ steps.prepare.outputs.docker_image }}:${{steps.prepare.outputs.version }} --file ./Dockerfile --output type=image,push=true . diff --git a/README.md b/README.md index 6ca09d6..004ea6e 100644 --- a/README.md +++ b/README.md @@ -3,8 +3,7 @@ This repo contains Dockerfiles used for autobuilding on Dockerhub. No guarantee for completeness or functionality. -|URL|Folder|Description|x86_64|arm32v7|aarch64| -|:--|:-----|:----------|:----:|:-----:|:-----:| -|[dragonchaser/webtest](https://hub.docker.com/r/dragonchaser/webtest)|webtest|A small container running ruby WebRick and serves static content from /web|x|x|| -|[dragonchaser/motsognir](https://hub.docker.com/r/dragonchaser/motsognir) |motsognir|A container for the motsognir gopher server|x|x|| -|[ghcr.io/dragonchaser/ghrunner](https://github.com/dragonchaser/dockerhub-autobuild/pkgs/container/ghrunner)|ghrunner |A container for running github runners |x| |x| +|URL|Folder|Description|x86_64|aarch64| +|:--|:-----|:----------|:----:|:-----:| +|[dragonchaser/webtest](https://hub.docker.com/r/dragonchaser/webtest)|webtest|A small container running ruby WebRick and serves static content from /web|x||x| +|[dragonchaser/motsognir](https://hub.docker.com/r/dragonchaser/motsognir) |motsognir|A container for the motsognir gopher server|x||x| diff --git a/ghrunner/Dockerfile b/ghrunner/Dockerfile deleted file mode 100644 index 1b191cc..0000000 --- a/ghrunner/Dockerfile +++ /dev/null @@ -1,16 +0,0 @@ -FROM ubuntu:latest -COPY entrypoint.sh / -ENV TZ=Europe/Berlin -ENV DEBIAN_FRONTEND=noninteractive -RUN apt-get update \ - && apt-get -y install \ - curl \ - libdigest-sha-perl \ - tzdata \ - sudo -RUN useradd -ms /bin/bash runner -RUN usermod -aG sudo runner -WORKDIR /runner -RUN chown runner:runner /runner -Rfv -ENTRYPOINT ["/entrypoint.sh"] - diff --git a/ghrunner/README.md b/ghrunner/README.md deleted file mode 100644 index 54c68b5..0000000 --- a/ghrunner/README.md +++ /dev/null @@ -1,21 +0,0 @@ -# GHRUNNER - -This is a small Dockerfile providing a github runner. -The images can be found `ghcr.io/dragonchaser/ghrunner:latest`. -Supported arches are: - - aarch64 - - amd64 - -## Environment variables -```terminal -| Variable | Values | default | -|------------+----------------------------------------+----------------| -| `TOKEN` | token for runner from github | | -| `ARCH` | arm64, x64 | x64 | -| `OS` | linux,osx | linux | -| `ORG` | name of the github org | | -| `REPO` | name of the github repo | | -| `VERSION` | version of the github runner to user | 2.280.3 | -| `CHECKSUM` | checksum for the github runner version | valid checksum | -``` - diff --git a/ghrunner/entrypoint.sh b/ghrunner/entrypoint.sh deleted file mode 100755 index 295c1d8..0000000 --- a/ghrunner/entrypoint.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash -ARCH=${ARCH:-x64} -VERSION=${VERSION:-2.280.3} -CHECKSUM=${CHECKSUM:-69dc323312e3c5547ba1e1cc46c127e2ca8ee7d7037e17ee6965ef6dac3c142b} -ORG=${ORG:-dragonchaser} -REPO=${REPO:-dockerhub-autobuild} -OS=${OS:-linux} - -if [ -z "${ORG}" ]; then - echo "missing ORG, bailing out!" -fi - -if [ -z "${REPO}" ]; then - echo "missing REPO, bailing out!" -fi - -if [ -z "${TOKEN}" ]; then - echo "missing TOKEN, bailing out!" - exit 1 -fi - -FILE="actions-runner-${OS}-${ARCH}-${VERSION}.tar.gz" -curl -o ${FILE} -L https://github.com/actions/runner/releases/download/v${VERSION}/${FILE} -echo "${CHECKSUM} ${FILE}" | shasum -a 256 -c -tar xzf ./${FILE} -./bin/installdependencies.sh -su runner -c "./config.sh --unattended --url https://github.com/${ORG}/${REPO} --token ${TOKEN} --name docker-runner-$(hostname) --labels=${ARCH},${OS},self-hosted" -while true; do - su runner -c "./run.sh" -done diff --git a/motsognir/Dockerfile b/motsognir/Dockerfile index 5099e67..5dd806a 100644 --- a/motsognir/Dockerfile +++ b/motsognir/Dockerfile @@ -1,5 +1,5 @@ FROM debian:latest -LABEL maintainer="dragonchaser " +LABEL maintainer="dragonchaser " ENV VERSION=1.0.13 ENV TARBALL="motsognir-${VERSION}.tar.xz" EXPOSE 70 diff --git a/webtest/Dockerfile b/webtest/Dockerfile index 7191067..4a5c798 100644 --- a/webtest/Dockerfile +++ b/webtest/Dockerfile @@ -1,12 +1,12 @@ FROM debian:latest -LABEL maintainer="dragonchaser " +LABEL maintainer="dragonchaser " RUN apt-get update \ && apt-get install -y ruby \ && rm -rf /var/lib/apt/lists/* \ && mkdir /web \ && chmod 0777 /web -COPY ./entrypoint.sh /bin -COPY ./index.html /web +COPY ./webtest/entrypoint.sh /bin +COPY ./webtest/index.html /web WORKDIR /web EXPOSE 80 ENTRYPOINT entrypoint.sh