From b765ffce07a2c2b7b6f69c4cc24aeb6b1222ecb1 Mon Sep 17 00:00:00 2001 From: Paul Munteanu Date: Fri, 13 Aug 2021 00:25:26 +0300 Subject: [PATCH 01/14] Implement docker publishing for each project --- .github/workflows/docker-publish-api.yml | 47 ++++++++++++++++++++ .github/workflows/docker-publish-cdn.yml | 47 ++++++++++++++++++++ .github/workflows/docker-publish-gateway.yml | 47 ++++++++++++++++++++ 3 files changed, 141 insertions(+) create mode 100644 .github/workflows/docker-publish-api.yml create mode 100644 .github/workflows/docker-publish-cdn.yml create mode 100644 .github/workflows/docker-publish-gateway.yml diff --git a/.github/workflows/docker-publish-api.yml b/.github/workflows/docker-publish-api.yml new file mode 100644 index 00000000..70871e6a --- /dev/null +++ b/.github/workflows/docker-publish-api.yml @@ -0,0 +1,47 @@ +name: docker-publish-api + +on: + push: + paths: + - 'api/**' + +jobs: + docker-api: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - + name: Cache Docker layers + uses: actions/cache@v2 + with: + path: /tmp/.buildx-cache/api + key: ${{ runner.os }}-buildx-${{ github.sha }}-api + restore-keys: | + ${{ runner.os }}-buildx-api + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + uses: docker/build-push-action@v2 + with: + context: ./api + push: true + tags: ${{ secrets.DOCKERHUB_TAGS }} + cache-from: type=local,src=/tmp/.buildx-cache/api + cache-to: type=local,dest=/tmp/.buildx-cache-new/api + - + # Hackfix to cleanup cache; replace after buildx 0.6 and BuildKit 0.9 are GA + # https://github.com/docker/build-push-action/pull/406#issuecomment-879184394 + name: Move cache fix + run: | + rm -rf /tmp/.buildx-cache/api + mv /tmp/.buildx-cache-new/api /tmp/.buildx-cache/api \ No newline at end of file diff --git a/.github/workflows/docker-publish-cdn.yml b/.github/workflows/docker-publish-cdn.yml new file mode 100644 index 00000000..ec83eaeb --- /dev/null +++ b/.github/workflows/docker-publish-cdn.yml @@ -0,0 +1,47 @@ +name: docker-publish-cdn + +on: + push: + paths: + - 'cdn/**' + +jobs: + docker-cdn: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - + name: Cache Docker layers + uses: actions/cache@v2 + with: + path: /tmp/.buildx-cache/cdn + key: ${{ runner.os }}-buildx-${{ github.sha }}-cdn + restore-keys: | + ${{ runner.os }}-buildx-cdn + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + uses: docker/build-push-action@v2 + with: + context: ./cdn + push: true + tags: ${{ secrets.DOCKERHUB_TAGS }} + cache-from: type=local,src=/tmp/.buildx-cache/cdn + cache-to: type=local,dest=/tmp/.buildx-cache-new/cdn + - + # Hackfix to cleanup cache; replace after buildx 0.6 and BuildKit 0.9 are GA + # https://github.com/docker/build-push-action/pull/406#issuecomment-879184394 + name: Move cache fix + run: | + rm -rf /tmp/.buildx-cache/cdn + mv /tmp/.buildx-cache-new/cdn /tmp/.buildx-cache/cdn \ No newline at end of file diff --git a/.github/workflows/docker-publish-gateway.yml b/.github/workflows/docker-publish-gateway.yml new file mode 100644 index 00000000..0597b00d --- /dev/null +++ b/.github/workflows/docker-publish-gateway.yml @@ -0,0 +1,47 @@ +name: docker-publish-gw + +on: + push: + paths: + - 'gateway/**' + +jobs: + docker-gw: + runs-on: ubuntu-latest + steps: + - + name: Checkout + uses: actions/checkout@v2 + - + name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - + name: Cache Docker layers + uses: actions/cache@v2 + with: + path: /tmp/.buildx-cache/gw + key: ${{ runner.os }}-buildx-${{ github.sha }}-gw + restore-keys: | + ${{ runner.os }}-buildx-gw + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - + name: Build and push + uses: docker/build-push-action@v2 + with: + context: ./gateway + push: true + tags: ${{ secrets.DOCKERHUB_TAGS }} + cache-from: type=local,src=/tmp/.buildx-cache/gw + cache-to: type=local,dest=/tmp/.buildx-cache-new/gw + - + # Hackfix to cleanup cache; replace after buildx 0.6 and BuildKit 0.9 are GA + # https://github.com/docker/build-push-action/pull/406#issuecomment-879184394 + name: Move cache fix + run: | + rm -rf /tmp/.buildx-cache/gw + mv /tmp/.buildx-cache-new/gw /tmp/.buildx-cache/gw \ No newline at end of file From 5cf7cc6edccbc0bd2a29cbe463c16695809a1b8f Mon Sep 17 00:00:00 2001 From: Paul Munteanu Date: Fri, 13 Aug 2021 00:30:34 +0300 Subject: [PATCH 02/14] Add tags for each image --- .github/workflows/docker-publish-api.yml | 2 +- .github/workflows/docker-publish-cdn.yml | 2 +- .github/workflows/docker-publish-gateway.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-publish-api.yml b/.github/workflows/docker-publish-api.yml index 70871e6a..5d64303f 100644 --- a/.github/workflows/docker-publish-api.yml +++ b/.github/workflows/docker-publish-api.yml @@ -35,7 +35,7 @@ jobs: with: context: ./api push: true - tags: ${{ secrets.DOCKERHUB_TAGS }} + tags: ${{ secrets.DOCKERHUB_TAGS_API }} cache-from: type=local,src=/tmp/.buildx-cache/api cache-to: type=local,dest=/tmp/.buildx-cache-new/api - diff --git a/.github/workflows/docker-publish-cdn.yml b/.github/workflows/docker-publish-cdn.yml index ec83eaeb..2350ce03 100644 --- a/.github/workflows/docker-publish-cdn.yml +++ b/.github/workflows/docker-publish-cdn.yml @@ -35,7 +35,7 @@ jobs: with: context: ./cdn push: true - tags: ${{ secrets.DOCKERHUB_TAGS }} + tags: ${{ secrets.DOCKERHUB_TAGS_CDN }} cache-from: type=local,src=/tmp/.buildx-cache/cdn cache-to: type=local,dest=/tmp/.buildx-cache-new/cdn - diff --git a/.github/workflows/docker-publish-gateway.yml b/.github/workflows/docker-publish-gateway.yml index 0597b00d..7a569197 100644 --- a/.github/workflows/docker-publish-gateway.yml +++ b/.github/workflows/docker-publish-gateway.yml @@ -35,7 +35,7 @@ jobs: with: context: ./gateway push: true - tags: ${{ secrets.DOCKERHUB_TAGS }} + tags: ${{ secrets.DOCKERHUB_TAGS_GW }} cache-from: type=local,src=/tmp/.buildx-cache/gw cache-to: type=local,dest=/tmp/.buildx-cache-new/gw - From 02ec4549ee1d70f9cca1b0726875f6abd6da31b9 Mon Sep 17 00:00:00 2001 From: Paul Munteanu Date: Fri, 13 Aug 2021 00:33:56 +0300 Subject: [PATCH 03/14] [API/Docker] Test --- api/TESTFILE1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 api/TESTFILE1 diff --git a/api/TESTFILE1 b/api/TESTFILE1 new file mode 100644 index 00000000..b4785957 --- /dev/null +++ b/api/TESTFILE1 @@ -0,0 +1 @@ +s From 97e5cb19a9eaf93e299d92324aa40cdbf5262323 Mon Sep 17 00:00:00 2001 From: Paul Munteanu Date: Fri, 13 Aug 2021 00:37:20 +0300 Subject: [PATCH 04/14] [API/Docker] Remove test file --- api/TESTFILE1 | 1 - 1 file changed, 1 deletion(-) delete mode 100644 api/TESTFILE1 diff --git a/api/TESTFILE1 b/api/TESTFILE1 deleted file mode 100644 index b4785957..00000000 --- a/api/TESTFILE1 +++ /dev/null @@ -1 +0,0 @@ -s From 1710c1ff353b4fc3481a39651169a31f577c61a7 Mon Sep 17 00:00:00 2001 From: Paul Munteanu Date: Fri, 13 Aug 2021 00:41:39 +0300 Subject: [PATCH 05/14] [API/Docker] Yet another test --- api/src/test/mongo_test.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/api/src/test/mongo_test.ts b/api/src/test/mongo_test.ts index 44b04c5b..a5a7aa1b 100644 --- a/api/src/test/mongo_test.ts +++ b/api/src/test/mongo_test.ts @@ -38,3 +38,4 @@ async function main() { } main(); +// Test From d72f6f59cbe1d06c288bc61d48997ef443b345b7 Mon Sep 17 00:00:00 2001 From: Paul Munteanu Date: Fri, 13 Aug 2021 00:47:19 +0300 Subject: [PATCH 06/14] [API/Docker] Fix cache keys --- .github/workflows/docker-publish-api.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-publish-api.yml b/.github/workflows/docker-publish-api.yml index 5d64303f..405faae4 100644 --- a/.github/workflows/docker-publish-api.yml +++ b/.github/workflows/docker-publish-api.yml @@ -20,9 +20,9 @@ jobs: uses: actions/cache@v2 with: path: /tmp/.buildx-cache/api - key: ${{ runner.os }}-buildx-${{ github.sha }}-api + key: ${{ runner.os }}-buildx-api-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-api + ${{ runner.os }}-buildx-api- - name: Login to DockerHub uses: docker/login-action@v1 From 69fefa5988f9fc887601b97e31f429f5ea3be814 Mon Sep 17 00:00:00 2001 From: Paul Munteanu Date: Fri, 13 Aug 2021 00:47:56 +0300 Subject: [PATCH 07/14] [API/Docker] Remove test change --- api/src/test/mongo_test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/api/src/test/mongo_test.ts b/api/src/test/mongo_test.ts index a5a7aa1b..44b04c5b 100644 --- a/api/src/test/mongo_test.ts +++ b/api/src/test/mongo_test.ts @@ -38,4 +38,3 @@ async function main() { } main(); -// Test From a3ea2d4e0d03b4901d7f1752ab211d254d58ead7 Mon Sep 17 00:00:00 2001 From: Paul Munteanu Date: Fri, 13 Aug 2021 00:50:58 +0300 Subject: [PATCH 08/14] [API/Docker] Add test file --- api/TESTFILE | 1 + 1 file changed, 1 insertion(+) create mode 100644 api/TESTFILE diff --git a/api/TESTFILE b/api/TESTFILE new file mode 100644 index 00000000..2a02d41c --- /dev/null +++ b/api/TESTFILE @@ -0,0 +1 @@ +TEST From 44259e4a4ebd95e73966d6575ebf6bfe37e22cb4 Mon Sep 17 00:00:00 2001 From: Paul Munteanu Date: Fri, 13 Aug 2021 00:53:03 +0300 Subject: [PATCH 09/14] [API/Docker] Remove test file --- api/TESTFILE | 1 - 1 file changed, 1 deletion(-) delete mode 100644 api/TESTFILE diff --git a/api/TESTFILE b/api/TESTFILE deleted file mode 100644 index 2a02d41c..00000000 --- a/api/TESTFILE +++ /dev/null @@ -1 +0,0 @@ -TEST From 917a4e0645e667dcdf9892be174a457292554094 Mon Sep 17 00:00:00 2001 From: Paul Munteanu Date: Fri, 13 Aug 2021 00:53:48 +0300 Subject: [PATCH 10/14] [Docker] Fix docker publish for cdn and gateway --- .github/workflows/docker-publish-cdn.yml | 4 ++-- .github/workflows/docker-publish-gateway.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker-publish-cdn.yml b/.github/workflows/docker-publish-cdn.yml index 2350ce03..9b3f6a64 100644 --- a/.github/workflows/docker-publish-cdn.yml +++ b/.github/workflows/docker-publish-cdn.yml @@ -20,9 +20,9 @@ jobs: uses: actions/cache@v2 with: path: /tmp/.buildx-cache/cdn - key: ${{ runner.os }}-buildx-${{ github.sha }}-cdn + key: ${{ runner.os }}-buildx-cdn-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-cdn + ${{ runner.os }}-buildx-cdn- - name: Login to DockerHub uses: docker/login-action@v1 diff --git a/.github/workflows/docker-publish-gateway.yml b/.github/workflows/docker-publish-gateway.yml index 7a569197..eac1052b 100644 --- a/.github/workflows/docker-publish-gateway.yml +++ b/.github/workflows/docker-publish-gateway.yml @@ -20,9 +20,9 @@ jobs: uses: actions/cache@v2 with: path: /tmp/.buildx-cache/gw - key: ${{ runner.os }}-buildx-${{ github.sha }}-gw + key: ${{ runner.os }}-buildx-gw-${{ github.sha }} restore-keys: | - ${{ runner.os }}-buildx-gw + ${{ runner.os }}-buildx-gw- - name: Login to DockerHub uses: docker/login-action@v1 From f49b65ab86372857b635e5435f48ab450621bcf9 Mon Sep 17 00:00:00 2001 From: Paul Munteanu Date: Fri, 13 Aug 2021 00:54:17 +0300 Subject: [PATCH 11/14] [CDN/Docker] Add test file --- cdn/TESTFILE | 1 + 1 file changed, 1 insertion(+) create mode 100644 cdn/TESTFILE diff --git a/cdn/TESTFILE b/cdn/TESTFILE new file mode 100644 index 00000000..2a02d41c --- /dev/null +++ b/cdn/TESTFILE @@ -0,0 +1 @@ +TEST From d1a13d5dd28a87f0231e312c0b46bb22b97c3a6c Mon Sep 17 00:00:00 2001 From: Paul Munteanu Date: Fri, 13 Aug 2021 00:54:46 +0300 Subject: [PATCH 12/14] [Gateway/Docker] Add test file --- gateway/TESTFILE | 1 + 1 file changed, 1 insertion(+) create mode 100644 gateway/TESTFILE diff --git a/gateway/TESTFILE b/gateway/TESTFILE new file mode 100644 index 00000000..2a02d41c --- /dev/null +++ b/gateway/TESTFILE @@ -0,0 +1 @@ +TEST From 56311a688d4c68f62405d021ae4c0105f30cf4e8 Mon Sep 17 00:00:00 2001 From: Paul Munteanu Date: Fri, 13 Aug 2021 00:56:58 +0300 Subject: [PATCH 13/14] [CDN/Docker] Remove test file --- cdn/TESTFILE | 1 - 1 file changed, 1 deletion(-) delete mode 100644 cdn/TESTFILE diff --git a/cdn/TESTFILE b/cdn/TESTFILE deleted file mode 100644 index 2a02d41c..00000000 --- a/cdn/TESTFILE +++ /dev/null @@ -1 +0,0 @@ -TEST From 314967ddfc731d586b8ca3b0f75a852dd0b775a2 Mon Sep 17 00:00:00 2001 From: Paul Munteanu Date: Fri, 13 Aug 2021 00:57:16 +0300 Subject: [PATCH 14/14] [Gateway/Docker] Remove test file --- gateway/TESTFILE | 1 - 1 file changed, 1 deletion(-) delete mode 100644 gateway/TESTFILE diff --git a/gateway/TESTFILE b/gateway/TESTFILE deleted file mode 100644 index 2a02d41c..00000000 --- a/gateway/TESTFILE +++ /dev/null @@ -1 +0,0 @@ -TEST