From 19010e7e59f52d68955893e7f2a29f30e16e287d Mon Sep 17 00:00:00 2001 From: Keanu Date: Mon, 31 Aug 2020 21:15:41 +0200 Subject: [PATCH 01/12] Attempt #1 at adding Docker. --- Dockerfile | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..35723a0 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,7 @@ +FROM node:current-alpine + +COPY . . + +RUN npm run build + +CMD ["npm", "start"] \ No newline at end of file From a829e3d0bd46e1cb8762d7d3ee143775200e7601 Mon Sep 17 00:00:00 2001 From: Keanu Date: Mon, 31 Aug 2020 21:17:22 +0200 Subject: [PATCH 02/12] Create docker.yml --- .github/workflows/docker.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml new file mode 100644 index 0000000..781891f --- /dev/null +++ b/.github/workflows/docker.yml @@ -0,0 +1,18 @@ +name: Build Docker Image +on: + push: + branches: ["typescript", "docker"] +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Build and push Docker images + uses: docker/build-push-action@v1 + with: + username: keanucode + password: ${{ secrets.DOCKER_PASS }} + registry: docker.pkg.github.com + repository: keanucode/travbot-v3 + tags: latest From f8cd32914cb3c2626106cf92759af269cceee8bf Mon Sep 17 00:00:00 2001 From: Keanu Date: Mon, 31 Aug 2020 21:18:44 +0200 Subject: [PATCH 03/12] Added missing npm i to Dockerfile. --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 35723a0..ab33a22 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,6 +2,8 @@ FROM node:current-alpine COPY . . +RUN npm i + RUN npm run build CMD ["npm", "start"] \ No newline at end of file From 863057f4969e547f07c2d4b9f5d0c612e7546a04 Mon Sep 17 00:00:00 2001 From: Keanu Date: Mon, 31 Aug 2020 21:21:02 +0200 Subject: [PATCH 04/12] Updated Docker repo --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 781891f..08b6b63 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -14,5 +14,5 @@ jobs: username: keanucode password: ${{ secrets.DOCKER_PASS }} registry: docker.pkg.github.com - repository: keanucode/travbot-v3 + repository: keanucode/travbot-v3/travbot-v3 tags: latest From 8293dc3925fc61e00ae11d1ee2d3fd16ba5be32d Mon Sep 17 00:00:00 2001 From: Keanu Date: Mon, 31 Aug 2020 21:28:50 +0200 Subject: [PATCH 05/12] Fixed password. --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 08b6b63..ecd3358 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -12,7 +12,7 @@ jobs: uses: docker/build-push-action@v1 with: username: keanucode - password: ${{ secrets.DOCKER_PASS }} + password: ${{ secrets.GH_TOKEN }} registry: docker.pkg.github.com repository: keanucode/travbot-v3/travbot-v3 tags: latest From 61825e5fff85dcd90a9b2cafc33698a02cd7fd30 Mon Sep 17 00:00:00 2001 From: Keanu Date: Mon, 31 Aug 2020 21:33:35 +0200 Subject: [PATCH 06/12] Fixed username. --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index ecd3358..ed941a3 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -11,7 +11,7 @@ jobs: - name: Build and push Docker images uses: docker/build-push-action@v1 with: - username: keanucode + username: keanuplayz password: ${{ secrets.GH_TOKEN }} registry: docker.pkg.github.com repository: keanucode/travbot-v3/travbot-v3 From 7f811800d704f2a26ffc1ce14d47a939401d521d Mon Sep 17 00:00:00 2001 From: Keanu Date: Wed, 9 Sep 2020 13:11:17 +0200 Subject: [PATCH 07/12] Removed broken Docker workflow. This has been moved to Docker Hub, since it builds atomatically. --- .github/workflows/docker.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml deleted file mode 100644 index ed941a3..0000000 --- a/.github/workflows/docker.yml +++ /dev/null @@ -1,18 +0,0 @@ -name: Build Docker Image -on: - push: - branches: ["typescript", "docker"] -jobs: - build: - runs-on: ubuntu-latest - steps: - - name: Checkout code - uses: actions/checkout@v2 - - name: Build and push Docker images - uses: docker/build-push-action@v1 - with: - username: keanuplayz - password: ${{ secrets.GH_TOKEN }} - registry: docker.pkg.github.com - repository: keanucode/travbot-v3/travbot-v3 - tags: latest From 4da672f419c069b8bf81931dc6cd67c2a311597a Mon Sep 17 00:00:00 2001 From: Keanu Date: Thu, 10 Sep 2020 18:51:01 +0200 Subject: [PATCH 08/12] Create Dockerfile.armhf --- Dockerfile.armhf | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 Dockerfile.armhf diff --git a/Dockerfile.armhf b/Dockerfile.armhf new file mode 100644 index 0000000..4eec205 --- /dev/null +++ b/Dockerfile.armhf @@ -0,0 +1,9 @@ +FROM node:current-alpine + +COPY . . + +RUN npm i + +RUN npm run build + +CMD ["npm", "start"] From e6c435fa45e67bfb99f2662e3b1a590922665786 Mon Sep 17 00:00:00 2001 From: Keanu Date: Thu, 10 Sep 2020 20:38:33 +0200 Subject: [PATCH 09/12] Attempt to add Docker image build. --- .github/workflows/image.yml | 24 ++++++++++++++++++++++++ Dockerfile.armhf | 9 --------- 2 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/image.yml delete mode 100644 Dockerfile.armhf diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml new file mode 100644 index 0000000..7279695 --- /dev/null +++ b/.github/workflows/image.yml @@ -0,0 +1,24 @@ +name: Build Docker Image + Push + +on: + push: + branches: master + +jobs: + build: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + - name: Install Docker BuildX + id: buildx + uses: crazy-max/ghaction-docker-buildx@v1 + with: + version: latest + - name: Login to Docker Hub + run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin + - name: Build the image + run: | + docker buildx build \ + --tag keanucode/travbot-v3:latest \ + --platform linux/amd64,linux/arm/v8,linux/arm64 . diff --git a/Dockerfile.armhf b/Dockerfile.armhf deleted file mode 100644 index 4eec205..0000000 --- a/Dockerfile.armhf +++ /dev/null @@ -1,9 +0,0 @@ -FROM node:current-alpine - -COPY . . - -RUN npm i - -RUN npm run build - -CMD ["npm", "start"] From 005713efcacfeaf63a8ad02a3e46f62c91599b61 Mon Sep 17 00:00:00 2001 From: Keanu Date: Thu, 10 Sep 2020 21:03:44 +0200 Subject: [PATCH 10/12] Attempt to fix Docker action. --- .github/workflows/image.yml | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index 7279695..d16ded3 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -1,8 +1,9 @@ name: Build Docker Image + Push - on: push: - branches: master + branches: + - typescript + - docker jobs: build: @@ -16,9 +17,9 @@ jobs: with: version: latest - name: Login to Docker Hub - run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin + run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u "${{ secrets.DOCKER_USERNAME }}" --password-stdin - name: Build the image - run: | - docker buildx build \ + run: | + docker buildx build \ --tag keanucode/travbot-v3:latest \ --platform linux/amd64,linux/arm/v8,linux/arm64 . From 369937ad2b1fde4ecfceb15f5afd64aef86288aa Mon Sep 17 00:00:00 2001 From: Keanu Date: Thu, 10 Sep 2020 21:05:33 +0200 Subject: [PATCH 11/12] Changed v8 to v7. --- .github/workflows/image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index d16ded3..deec229 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -22,4 +22,4 @@ jobs: run: | docker buildx build \ --tag keanucode/travbot-v3:latest \ - --platform linux/amd64,linux/arm/v8,linux/arm64 . + --platform linux/amd64,linux/arm/v7,linux/arm64 . From 2960639dbd9a1300ad1d7d1f1d122761caacaac4 Mon Sep 17 00:00:00 2001 From: Keanu Date: Thu, 10 Sep 2020 21:11:32 +0200 Subject: [PATCH 12/12] Added --push flag --- .github/workflows/image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/image.yml b/.github/workflows/image.yml index deec229..953adcc 100644 --- a/.github/workflows/image.yml +++ b/.github/workflows/image.yml @@ -22,4 +22,4 @@ jobs: run: | docker buildx build \ --tag keanucode/travbot-v3:latest \ - --platform linux/amd64,linux/arm/v7,linux/arm64 . + --platform linux/amd64,linux/arm/v7,linux/arm64 --push .