From 5b38016f2be4193939e6719146b581bf759e6d8d Mon Sep 17 00:00:00 2001 From: Naramsim Date: Mon, 4 Dec 2023 10:28:55 +0100 Subject: [PATCH 01/16] feat: use compose v2/bump deps/commitandpush conditionally/add cicd --- .github/workflows/docker-build.yml | 40 ++++++++++++++++++++++++++++++ updater/Dockerfile | 6 ++--- updater/cmd.bash | 28 ++++++++++----------- 3 files changed, 56 insertions(+), 18 deletions(-) create mode 100644 .github/workflows/docker-build.yml diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml new file mode 100644 index 0000000000..393db8fcff --- /dev/null +++ b/.github/workflows/docker-build.yml @@ -0,0 +1,40 @@ +name: Build Docker image + +on: + pull_request: + +jobs: + docker: + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: pokeapi/updater + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@v3 + - name: Inspect builder + run: | + echo "Name: ${{ steps.buildx.outputs.name }}" + echo "Endpoint: ${{ steps.buildx.outputs.endpoint }}" + echo "Status: ${{ steps.buildx.outputs.status }}" + echo "Flags: ${{ steps.buildx.outputs.flags }}" + echo "Platforms: ${{ steps.buildx.outputs.platforms }}" + - name: Build + id: docker_build + uses: docker/build-push-action@v5 + with: + context: . + file: ./updater/Dockerfile + push: false + platforms: local + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + - name: Image digest + run: echo ${{ steps.docker_build.outputs.digest }} diff --git a/updater/Dockerfile b/updater/Dockerfile index 9d987d8cfd..e70c33d4ce 100644 --- a/updater/Dockerfile +++ b/updater/Dockerfile @@ -1,16 +1,14 @@ -FROM docker:18.09.3-dind +FROM docker:24.0.7-dind-alpine3.18 RUN apk update -RUN apk add curl python3 git bash dos2unix openssh build-base python3-dev +RUN apk add curl python3 git bash openssh build-base python3-dev RUN ln -sf $(ls /usr/bin/easy_install*) /usr/bin/easy_install RUN easy_install pip -COPY --from=docker/compose:1.25.0-alpine /usr/local/bin/docker-compose /usr/local/bin/ RUN mkdir /updater WORKDIR /updater COPY . /updater/ -RUN dos2unix cmd.bash ENV COMMIT_NAME 'Updater Bot' ENV COMMIT_EMAIL '' diff --git a/updater/cmd.bash b/updater/cmd.bash index 0015d6b818..83bbd78226 100644 --- a/updater/cmd.bash +++ b/updater/cmd.bash @@ -7,13 +7,13 @@ [ -z "${REPO_DATA}" ] && { echo "Need to set REPO_DATA"; exit 1; } [ -z "${BRANCH_NAME}" ] && { echo "Need to set BRANCH_NAME"; exit 1; } [ -z "${REPO_POKEAPI_CHECKOUT_OBJECT:=master}" ] && { echo "REPO_POKEAPI_CHECKOUT_OBJECT not set, defaulting to \`master\`"; } +[ -z "${TEST:=true}" ] +declare -r COMMIT_AND_PUSH="${COMMIT_AND_PUSH:-false}" set -e set -o pipefail set -x -export COMPOSE_INTERACTIVE_NO_CLI=1 - dockerd --host=unix:///var/run/docker.sock --host=tcp://0.0.0.0:2375 &> /dev/null & git clone "$REPO_POKEAPI" pokeapi @@ -25,12 +25,10 @@ git checkout "$REPO_POKEAPI_CHECKOUT_OBJECT" git submodule init git submodule update --remote -docker volume create --name=redis_data -docker volume create --name=pg_data -docker-compose -f docker-compose.yml -f docker-compose-dev.yml up -d +docker compose -f docker-compose.yml -f docker-compose-dev.yml up -d -docker-compose exec -T app python manage.py migrate --settings=config.docker-compose -docker-compose exec -T app sh -c 'echo "from data.v2.build import build_all; build_all()" | python manage.py shell --settings=config.docker-compose' +docker compose exec -T app python manage.py migrate --settings=config.docker-compose +docker compose exec -T app sh -c 'echo "from data.v2.build import build_all; build_all()" | python manage.py shell --settings=config.docker-compose' # set up the data side cd ../api-data @@ -46,11 +44,13 @@ ditto clone --src-url http://localhost/ --dest-dir ./data --select pokemon/129 ditto analyze --data-dir ./data # commit and push -git add data -git config user.name "$COMMIT_NAME" -git config user.email "$COMMIT_EMAIL" -if ! git commit -m "$COMMIT_MESSAGE"; then - echo "The generated data doesn't bring any updates" - exit 2 +if [ "$COMMIT_AND_PUSH" = 'true' ]; then + git add data + git config user.name "$COMMIT_NAME" + git config user.email "$COMMIT_EMAIL" + if ! git commit -m "$COMMIT_MESSAGE"; then + echo "The generated data doesn't bring any updates" + exit 2 + fi + git push -fu origin "$BRANCH_NAME" fi -git push -fu origin "$BRANCH_NAME" From 3bfd8b5fdeecc17db83cb5715717e4f0ce5d4489 Mon Sep 17 00:00:00 2001 From: Naramsim Date: Mon, 4 Dec 2023 10:33:14 +0100 Subject: [PATCH 02/16] fix: install pip --- updater/Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/updater/Dockerfile b/updater/Dockerfile index e70c33d4ce..67847f7e1a 100644 --- a/updater/Dockerfile +++ b/updater/Dockerfile @@ -1,10 +1,7 @@ FROM docker:24.0.7-dind-alpine3.18 RUN apk update -RUN apk add curl python3 git bash openssh build-base python3-dev - -RUN ln -sf $(ls /usr/bin/easy_install*) /usr/bin/easy_install -RUN easy_install pip +RUN apk add curl python3 git bash openssh build-base python3-dev py3-pip RUN mkdir /updater WORKDIR /updater From d7aa7c448c059eaae765e4cdada0e312f88b1ffa Mon Sep 17 00:00:00 2001 From: Naramsim Date: Mon, 4 Dec 2023 10:40:39 +0100 Subject: [PATCH 03/16] cicd: run image --- .github/workflows/docker-build.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 393db8fcff..4879e837e2 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -36,5 +36,9 @@ jobs: platforms: local tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - - name: Image digest - run: echo ${{ steps.docker_build.outputs.digest }} + - name: Run and test + run: docker run -e "COMMIT_AND_PUSH=false" --rm ${{ steps.meta.outputs.tags }} + - name: Image digest and tag + run: | + echo ${{ steps.docker_build.outputs.digest }} + echo ${{ steps.meta.outputs.tags }} From 7064f0f27fcc89d87fbdd48c5c71942282c1ce67 Mon Sep 17 00:00:00 2001 From: Naramsim Date: Mon, 4 Dec 2023 10:47:11 +0100 Subject: [PATCH 04/16] fix: use --output=type=docker shorthand --- .github/workflows/docker-build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 4879e837e2..3f8b775f12 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -32,8 +32,7 @@ jobs: with: context: . file: ./updater/Dockerfile - push: false - platforms: local + load: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - name: Run and test From db4ded3bb4fcec08fd90cc14ac8f01e9dd15b8b2 Mon Sep 17 00:00:00 2001 From: Naramsim Date: Mon, 4 Dec 2023 10:54:28 +0100 Subject: [PATCH 05/16] cicd: try different context --- .github/workflows/docker-build.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 3f8b775f12..016988f721 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -30,8 +30,7 @@ jobs: id: docker_build uses: docker/build-push-action@v5 with: - context: . - file: ./updater/Dockerfile + context: ./updater load: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} From e334719bfde2343af9f84d45261ae62ac96eb7b7 Mon Sep 17 00:00:00 2001 From: Naramsim Date: Mon, 4 Dec 2023 11:08:55 +0100 Subject: [PATCH 06/16] fix: move commit info/precise checkout of api-data repo --- .github/workflows/docker-build.yml | 2 +- updater/cmd.bash | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 016988f721..7c20920de1 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -35,7 +35,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - name: Run and test - run: docker run -e "COMMIT_AND_PUSH=false" --rm ${{ steps.meta.outputs.tags }} + run: docker run -e 'COMMIT_AND_PUSH=false' -e "REPO_APIDATA_CHECKOUT_OBJECT=${{ github.sha }}" --rm ${{ steps.meta.outputs.tags }} - name: Image digest and tag run: | echo ${{ steps.docker_build.outputs.digest }} diff --git a/updater/cmd.bash b/updater/cmd.bash index 83bbd78226..2dd46b626d 100644 --- a/updater/cmd.bash +++ b/updater/cmd.bash @@ -1,12 +1,10 @@ #!/usr/bin/env bash -[ -z "${COMMIT_NAME}" ] && { echo "Need to set COMMIT_NAME"; exit 1; } -[ -z "${COMMIT_EMAIL}" ] && { echo "Need to set COMMIT_EMAIL"; exit 1; } -[ -z "${COMMIT_MESSAGE}" ] && { echo "Need to set COMMIT_MESSAGE"; exit 1; } [ -z "${REPO_POKEAPI}" ] && { echo "Need to set REPO_POKEAPI"; exit 1; } [ -z "${REPO_DATA}" ] && { echo "Need to set REPO_DATA"; exit 1; } [ -z "${BRANCH_NAME}" ] && { echo "Need to set BRANCH_NAME"; exit 1; } [ -z "${REPO_POKEAPI_CHECKOUT_OBJECT:=master}" ] && { echo "REPO_POKEAPI_CHECKOUT_OBJECT not set, defaulting to \`master\`"; } +[ -z "${REPO_APIDATA_CHECKOUT_OBJECT:=master}" ] && { echo "REPO_APIDATA_CHECKOUT_OBJECT not set, defaulting to \`master\`"; } [ -z "${TEST:=true}" ] declare -r COMMIT_AND_PUSH="${COMMIT_AND_PUSH:-false}" @@ -32,6 +30,7 @@ docker compose exec -T app sh -c 'echo "from data.v2.build import build_all; bui # set up the data side cd ../api-data +git checkout "$REPO_APIDATA_CHECKOUT_OBJECT" git branch -D "$BRANCH_NAME" || true git branch "$BRANCH_NAME" git checkout "$BRANCH_NAME" @@ -45,6 +44,9 @@ ditto analyze --data-dir ./data # commit and push if [ "$COMMIT_AND_PUSH" = 'true' ]; then + [ -z "${COMMIT_NAME}" ] && { echo "Need to set COMMIT_NAME"; exit 1; } + [ -z "${COMMIT_EMAIL}" ] && { echo "Need to set COMMIT_EMAIL"; exit 1; } + [ -z "${COMMIT_MESSAGE}" ] && { echo "Need to set COMMIT_MESSAGE"; exit 1; } git add data git config user.name "$COMMIT_NAME" git config user.email "$COMMIT_EMAIL" From 61d3e7212a0b6c34bc0944f4e63c0e3346bbba93 Mon Sep 17 00:00:00 2001 From: Naramsim Date: Mon, 4 Dec 2023 11:12:33 +0100 Subject: [PATCH 07/16] cicd: fix use HTTPS --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 7c20920de1..fb8af1fb14 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -35,7 +35,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - name: Run and test - run: docker run -e 'COMMIT_AND_PUSH=false' -e "REPO_APIDATA_CHECKOUT_OBJECT=${{ github.sha }}" --rm ${{ steps.meta.outputs.tags }} + run: docker run -e 'COMMIT_AND_PUSH=false' -e "REPO_APIDATA_CHECKOUT_OBJECT=${{ github.sha }}" -e 'REPO_POKEAPI=https://github.com/PokeAPI/pokeapi.git' --rm ${{ steps.meta.outputs.tags }} - name: Image digest and tag run: | echo ${{ steps.docker_build.outputs.digest }} From 509a2f7de0b2bb9ff68fd381e5b7db6f0c7282b9 Mon Sep 17 00:00:00 2001 From: Naramsim Date: Mon, 4 Dec 2023 11:15:10 +0100 Subject: [PATCH 08/16] cicd: use HTTPS --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index fb8af1fb14..9239cc86e0 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -35,7 +35,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - name: Run and test - run: docker run -e 'COMMIT_AND_PUSH=false' -e "REPO_APIDATA_CHECKOUT_OBJECT=${{ github.sha }}" -e 'REPO_POKEAPI=https://github.com/PokeAPI/pokeapi.git' --rm ${{ steps.meta.outputs.tags }} + run: docker run -e 'COMMIT_AND_PUSH=false' -e "REPO_APIDATA_CHECKOUT_OBJECT=${{ github.sha }}" -e 'REPO_POKEAPI=https://github.com/PokeAPI/pokeapi.git' -e 'REPO_DATA=https://github.com/PokeAPI/api-data.git' --rm ${{ steps.meta.outputs.tags }} - name: Image digest and tag run: | echo ${{ steps.docker_build.outputs.digest }} From 63ad8f700943ae7d540fe5c31e96e5b6656ab2e0 Mon Sep 17 00:00:00 2001 From: Naramsim Date: Mon, 4 Dec 2023 11:24:23 +0100 Subject: [PATCH 09/16] cicd: mount docker socket --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 9239cc86e0..856b377e80 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -35,7 +35,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - name: Run and test - run: docker run -e 'COMMIT_AND_PUSH=false' -e "REPO_APIDATA_CHECKOUT_OBJECT=${{ github.sha }}" -e 'REPO_POKEAPI=https://github.com/PokeAPI/pokeapi.git' -e 'REPO_DATA=https://github.com/PokeAPI/api-data.git' --rm ${{ steps.meta.outputs.tags }} + run: docker run -v /var/run/docker.sock:/var/run/docker.sock -e 'COMMIT_AND_PUSH=false' -e "REPO_APIDATA_CHECKOUT_OBJECT=${{ github.sha }}" -e 'REPO_POKEAPI=https://github.com/PokeAPI/pokeapi.git' -e 'REPO_DATA=https://github.com/PokeAPI/api-data.git' --rm ${{ steps.meta.outputs.tags }} - name: Image digest and tag run: | echo ${{ steps.docker_build.outputs.digest }} From f7911904ca7478bee2584887da763b8d3d6f4b07 Mon Sep 17 00:00:00 2001 From: Naramsim Date: Mon, 4 Dec 2023 11:53:11 +0100 Subject: [PATCH 10/16] cicd: debug pwd --- updater/cmd.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/updater/cmd.bash b/updater/cmd.bash index 2dd46b626d..60bf891a49 100644 --- a/updater/cmd.bash +++ b/updater/cmd.bash @@ -22,7 +22,7 @@ cd pokeapi git checkout "$REPO_POKEAPI_CHECKOUT_OBJECT" git submodule init git submodule update --remote - +pwd docker compose -f docker-compose.yml -f docker-compose-dev.yml up -d docker compose exec -T app python manage.py migrate --settings=config.docker-compose From 492ceb7acc2ce1e0b8be68309debce0f84c22166 Mon Sep 17 00:00:00 2001 From: Naramsim Date: Mon, 4 Dec 2023 11:58:30 +0100 Subject: [PATCH 11/16] cicd: --priv --- .github/workflows/docker-build.yml | 2 +- updater/cmd.bash | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 856b377e80..c6fc18b6ae 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -35,7 +35,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - name: Run and test - run: docker run -v /var/run/docker.sock:/var/run/docker.sock -e 'COMMIT_AND_PUSH=false' -e "REPO_APIDATA_CHECKOUT_OBJECT=${{ github.sha }}" -e 'REPO_POKEAPI=https://github.com/PokeAPI/pokeapi.git' -e 'REPO_DATA=https://github.com/PokeAPI/api-data.git' --rm ${{ steps.meta.outputs.tags }} + run: docker run --privileged -v /var/run/docker.sock:/var/run/docker.sock -e 'COMMIT_AND_PUSH=false' -e "REPO_APIDATA_CHECKOUT_OBJECT=${{ github.sha }}" -e 'REPO_POKEAPI=https://github.com/PokeAPI/pokeapi.git' -e 'REPO_DATA=https://github.com/PokeAPI/api-data.git' --rm ${{ steps.meta.outputs.tags }} - name: Image digest and tag run: | echo ${{ steps.docker_build.outputs.digest }} diff --git a/updater/cmd.bash b/updater/cmd.bash index 60bf891a49..fa9ba0f73a 100644 --- a/updater/cmd.bash +++ b/updater/cmd.bash @@ -22,9 +22,8 @@ cd pokeapi git checkout "$REPO_POKEAPI_CHECKOUT_OBJECT" git submodule init git submodule update --remote -pwd -docker compose -f docker-compose.yml -f docker-compose-dev.yml up -d +docker compose -f docker-compose.yml -f docker-compose-dev.yml up -d docker compose exec -T app python manage.py migrate --settings=config.docker-compose docker compose exec -T app sh -c 'echo "from data.v2.build import build_all; build_all()" | python manage.py shell --settings=config.docker-compose' From 8f55b08e5510c6fee02f04b4c52c4603e3c1ddb1 Mon Sep 17 00:00:00 2001 From: Naramsim Date: Tue, 12 Dec 2023 07:51:36 +0100 Subject: [PATCH 12/16] cicd: debug with ssh --- .github/workflows/docker-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index c6fc18b6ae..ff4b826635 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -14,6 +14,8 @@ jobs: uses: docker/metadata-action@v5 with: images: pokeapi/updater + - name: Setup tmate session + uses: mxschmitt/action-tmate@v3 - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx From 4f82882413dfe49362e9d061ccd7b3b2808c2533 Mon Sep 17 00:00:00 2001 From: Naramsim Date: Tue, 12 Dec 2023 07:56:00 +0100 Subject: [PATCH 13/16] cicd: debug ssh detached --- .github/workflows/docker-build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index ff4b826635..6b86380665 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -16,6 +16,8 @@ jobs: images: pokeapi/updater - name: Setup tmate session uses: mxschmitt/action-tmate@v3 + with: + detached: true - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx From e97b7ac8e7a9b5c02bd0b9b573b46d24c3b9bc79 Mon Sep 17 00:00:00 2001 From: Naramsim Date: Tue, 12 Dec 2023 08:26:33 +0100 Subject: [PATCH 14/16] cicd: mount volume --- .github/workflows/docker-build.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 6b86380665..7ab9f7b41f 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -39,7 +39,7 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - name: Run and test - run: docker run --privileged -v /var/run/docker.sock:/var/run/docker.sock -e 'COMMIT_AND_PUSH=false' -e "REPO_APIDATA_CHECKOUT_OBJECT=${{ github.sha }}" -e 'REPO_POKEAPI=https://github.com/PokeAPI/pokeapi.git' -e 'REPO_DATA=https://github.com/PokeAPI/api-data.git' --rm ${{ steps.meta.outputs.tags }} + run: docker run --privileged -v /updater:/updater -v /var/run/docker.sock:/var/run/docker.sock -e 'COMMIT_AND_PUSH=false' -e "REPO_APIDATA_CHECKOUT_OBJECT=${{ github.sha }}" -e 'REPO_POKEAPI=https://github.com/PokeAPI/pokeapi.git' -e 'REPO_DATA=https://github.com/PokeAPI/api-data.git' --rm ${{ steps.meta.outputs.tags }} - name: Image digest and tag run: | echo ${{ steps.docker_build.outputs.digest }} From 4098c11480bf3cc71d5cdccce1bfb886f5809e7f Mon Sep 17 00:00:00 2001 From: Naramsim Date: Tue, 12 Dec 2023 08:47:10 +0100 Subject: [PATCH 15/16] cicd: dont run in dind --- .github/workflows/docker-build.yml | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index 7ab9f7b41f..c0e8a14fb1 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -18,6 +18,10 @@ jobs: uses: mxschmitt/action-tmate@v3 with: detached: true + - uses: actions/setup-python@v4 + with: + python-version: '3.10' + cache: 'pip' - name: Set up QEMU uses: docker/setup-qemu-action@v3 - name: Set up Docker Buildx @@ -39,7 +43,11 @@ jobs: tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} - name: Run and test - run: docker run --privileged -v /updater:/updater -v /var/run/docker.sock:/var/run/docker.sock -e 'COMMIT_AND_PUSH=false' -e "REPO_APIDATA_CHECKOUT_OBJECT=${{ github.sha }}" -e 'REPO_POKEAPI=https://github.com/PokeAPI/pokeapi.git' -e 'REPO_DATA=https://github.com/PokeAPI/api-data.git' --rm ${{ steps.meta.outputs.tags }} + run: (cd updater && bash cmd.bash) + env: + COMMIT_AND_PUSH: false + REPO_POKEAPI: https://github.com/PokeAPI/pokeapi.git + REPO_DATA: https://github.com/PokeAPI/api-data.git - name: Image digest and tag run: | echo ${{ steps.docker_build.outputs.digest }} From 845dd53c413cf16546973db99d08dcc81d1fd276 Mon Sep 17 00:00:00 2001 From: Naramsim Date: Tue, 12 Dec 2023 08:50:41 +0100 Subject: [PATCH 16/16] cicd: add missing env --- .github/workflows/docker-build.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml index c0e8a14fb1..62647acaa8 100644 --- a/.github/workflows/docker-build.yml +++ b/.github/workflows/docker-build.yml @@ -45,9 +45,13 @@ jobs: - name: Run and test run: (cd updater && bash cmd.bash) env: + BRANCH_NAME: updater-bot COMMIT_AND_PUSH: false - REPO_POKEAPI: https://github.com/PokeAPI/pokeapi.git + COMMIT_EMAIL: "" + COMMIT_MESSAGE: "[Updater Bot] Regenerate data" + COMMIT_NAME: Updater Bot REPO_DATA: https://github.com/PokeAPI/api-data.git + REPO_POKEAPI: https://github.com/PokeAPI/pokeapi.git - name: Image digest and tag run: | echo ${{ steps.docker_build.outputs.digest }}