From 864adffd2518cbd2e8c3af8c88e6584232ec3916 Mon Sep 17 00:00:00 2001 From: David Binney Date: Tue, 18 Jun 2024 19:27:24 +0930 Subject: [PATCH 1/5] wip: added env for secrets --- .github/workflows/docker-build-push.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 1e2c197..574d49e 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -22,6 +22,7 @@ jobs: docker: needs: cache runs-on: ubuntu-latest + environment: ci permissions: contents: write packages: write From 1bbf04737d3caacf65fdbf7d2e2c170b6bf34f1a Mon Sep 17 00:00:00 2001 From: David Binney Date: Tue, 18 Jun 2024 19:29:28 +0930 Subject: [PATCH 2/5] wip: formatting --- .github/workflows/docker-build-push.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index 574d49e..c331597 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -1,5 +1,4 @@ name: Docker build and push - on: push: tags: From 8f709071bcdf6982aee02b41f2035a0588f6d0dc Mon Sep 17 00:00:00 2001 From: David Binney Date: Tue, 18 Jun 2024 19:32:14 +0930 Subject: [PATCH 3/5] wip: use var for username --- .github/workflows/docker-build-push.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-build-push.yml b/.github/workflows/docker-build-push.yml index c331597..6eb268f 100644 --- a/.github/workflows/docker-build-push.yml +++ b/.github/workflows/docker-build-push.yml @@ -39,7 +39,7 @@ jobs: - name: Login to Docker Hub uses: docker/login-action@v3 with: - username: ${{ secrets.DOCKERHUB_USERNAME }} + username: ${{ vars.DOCKERHUB_USERNAME }} password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Login to GitHub Container Registry From d442e40fcdcf44402adda658b658489599ccc66b Mon Sep 17 00:00:00 2001 From: David Binney Date: Tue, 18 Jun 2024 20:06:17 +0930 Subject: [PATCH 4/5] wip: bounce to debian buster + mongo --- Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Dockerfile b/Dockerfile index d9a2f46..c076c89 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Description: Dockerfile for the Sleeper service -FROM debian:buster-slim +FROM debian:bookworm-slim # Metadata ARG VERSION=latest @@ -15,7 +15,7 @@ COPY ./*.sh /app/ # Update and install basic tools RUN apt-get update && apt-get install -y \ - dnsutils netcat curl wget tar gnupg vim tmux zsh screenfetch && \ + dnsutils netcat-openbsd curl wget tar gnupg vim tmux zsh screenfetch && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* @@ -37,8 +37,8 @@ RUN apt-get update && apt-get install -y \ rm -rf /var/lib/apt/lists/* # Install MongoDB tools -RUN wget -qO - https://www.mongodb.org/static/pgp/server-4.4.asc | apt-key add - && \ - echo "deb http://repo.mongodb.org/apt/debian buster/mongodb-org/4.4 main" | tee /etc/apt/sources.list.d/mongodb-org-4.4.list && \ +RUN curl -fsSL https://www.mongodb.org/static/pgp/server-7.0.asc | gpg -o /usr/share/keyrings/mongodb-server-7.0.gpg --dearmor && \ + echo "deb [ signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg ] http://repo.mongodb.org/apt/debian bookworm/mongodb-org/7.0 main" | tee /etc/apt/sources.list.d/mongodb-org-7.0.list && \ apt-get update && apt-get install -y mongodb-org-tools && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* From aa387bb602a79ebf637c70a66be03191e9f24a15 Mon Sep 17 00:00:00 2001 From: David Binney Date: Tue, 18 Jun 2024 20:19:02 +0930 Subject: [PATCH 5/5] wip: just removing mongo for the moment and linked release This will link up the release to the success of this workflow. --- .github/workflows/release.yml | 6 ++++++ Dockerfile | 12 ++++++------ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5e884bd..c0d8b49 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,6 +1,12 @@ name: Release on: + workflow_run: + workflows: ["Docker build and push"] + tags: [ 'v*.*.*' ] + types: + - completed + push: tags: [ 'v*.*.*' ] diff --git a/Dockerfile b/Dockerfile index c076c89..455c03f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -36,12 +36,12 @@ RUN apt-get update && apt-get install -y \ apt-get clean && \ rm -rf /var/lib/apt/lists/* -# Install MongoDB tools -RUN curl -fsSL https://www.mongodb.org/static/pgp/server-7.0.asc | gpg -o /usr/share/keyrings/mongodb-server-7.0.gpg --dearmor && \ - echo "deb [ signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg ] http://repo.mongodb.org/apt/debian bookworm/mongodb-org/7.0 main" | tee /etc/apt/sources.list.d/mongodb-org-7.0.list && \ - apt-get update && apt-get install -y mongodb-org-tools && \ - apt-get clean && \ - rm -rf /var/lib/apt/lists/* +# # Install MongoDB tools +# RUN curl -fsSL https://www.mongodb.org/static/pgp/server-7.0.asc | gpg -o /usr/share/keyrings/mongodb-server-7.0.gpg --dearmor && \ +# echo "deb [ signed-by=/usr/share/keyrings/mongodb-server-7.0.gpg ] http://repo.mongodb.org/apt/debian bookworm/mongodb-org/7.0 main" | tee /etc/apt/sources.list.d/mongodb-org-7.0.list && \ +# apt-get update && apt-get install -y mongodb-org-tools && \ +# apt-get clean && \ +# rm -rf /var/lib/apt/lists/* RUN ./kickstart.sh