From b0d56061edb4ee0bf114a11318506039bdeac1a0 Mon Sep 17 00:00:00 2001 From: Gianmarco Fraccaroli Date: Fri, 13 Sep 2024 14:50:10 +0200 Subject: [PATCH 1/9] fix: ci push to docker registry --- .github/workflows/docker.yml | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 787a8f23ec..6545df79ce 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -25,12 +25,12 @@ jobs: matrix: images: - path: "docker/namadillo/Dockerfile" - tag: "namadillo" + tag: "namadillo-main" - path: "docker/faucet/Dockerfile" - tag: "faucet-interface" + tag: "faucet-interface-main" steps: - - name: Checkout repo + - name: Checkout repository uses: actions/checkout@v4 - name: Set up QEMU uses: docker/setup-qemu-action@v3 @@ -42,12 +42,19 @@ jobs: registry: ghcr.io username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} + - name: Docker meta + id: meta + uses: docker/metadata-action@v4 + with: + images: ghcr.io/${{ github.repository_owner }}/namada-interface + tags: type=raw,value=${{ matrix.images.tag }} - name: Build and Push docker image uses: docker/build-push-action@v3 with: context: . file: ${{ matrix.images.path }} - push: ${{ github.ref == 'refs/heads/main' }} - tags: ${{ matrix.images.tag }}-latest, ${{ matrix.images.tag }}-main + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha cache-to: type=gha,mode=max \ No newline at end of file From 4fab5071ee75607bfaa10a738820c168288652b1 Mon Sep 17 00:00:00 2001 From: Gianmarco Fraccaroli Date: Fri, 13 Sep 2024 14:54:27 +0200 Subject: [PATCH 2/9] ci: upgrade gh actions --- .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 6545df79ce..2ddbb0fae7 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -49,7 +49,7 @@ jobs: images: ghcr.io/${{ github.repository_owner }}/namada-interface tags: type=raw,value=${{ matrix.images.tag }} - name: Build and Push docker image - uses: docker/build-push-action@v3 + uses: docker/build-push-action@v6 with: context: . file: ${{ matrix.images.path }} From 334c8ba8d797833ef5fcf55acef649519dc958b6 Mon Sep 17 00:00:00 2001 From: Gianmarco Fraccaroli Date: Fri, 13 Sep 2024 15:27:41 +0200 Subject: [PATCH 3/9] ci: cancel jobs if a new one is queued --- .github/workflows/docker.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 2ddbb0fae7..27c4abffdf 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -9,6 +9,10 @@ on: branches: - main +concurrency: + group: ${{ github.workflow }}-${{ github.event.pull_request.number }} + cancel-in-progress: true + env: GIT_LFS_SKIP_SMUDGE: 1 @@ -53,7 +57,7 @@ jobs: with: context: . file: ${{ matrix.images.path }} - push: true + push: ${{ github.ref == 'refs/heads/main' }} tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha From cfdbf7bab3a08d2d5791e8c0932c8497bed40b60 Mon Sep 17 00:00:00 2001 From: Gianmarco Fraccaroli Date: Fri, 13 Sep 2024 16:00:50 +0200 Subject: [PATCH 4/9] feat: test --- .github/workflows/docker.yml | 2 +- apps/faucet/webpack.config.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 27c4abffdf..0698f13d5a 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -57,7 +57,7 @@ jobs: with: context: . file: ${{ matrix.images.path }} - push: ${{ github.ref == 'refs/heads/main' }} + push: true tags: ${{ steps.meta.outputs.tags }} labels: ${{ steps.meta.outputs.labels }} cache-from: type=gha diff --git a/apps/faucet/webpack.config.js b/apps/faucet/webpack.config.js index af72cdeca8..b4f05e7d31 100644 --- a/apps/faucet/webpack.config.js +++ b/apps/faucet/webpack.config.js @@ -10,8 +10,6 @@ require("dotenv").config({ path: resolve(__dirname, ".env") }); const { NODE_ENV } = process.env; -const ASSET_PATH = "/"; - const createStyledComponentsTransformer = require("typescript-plugin-styled-components").default; @@ -62,7 +60,7 @@ module.exports = { faucet: "./src", }, output: { - publicPath: ASSET_PATH, + publicPath: "", path: resolve(__dirname, `./build/`), filename: "[name].bundle.js", }, From b003696afb47b1e8ea841a16f559fa204acea24f Mon Sep 17 00:00:00 2001 From: Gianmarco Fraccaroli Date: Fri, 13 Sep 2024 16:19:01 +0200 Subject: [PATCH 5/9] feat: test --- docker/faucet/Dockerfile | 1 - docker/faucet/nginx.conf | 11 ----------- 2 files changed, 12 deletions(-) delete mode 100644 docker/faucet/nginx.conf diff --git a/docker/faucet/Dockerfile b/docker/faucet/Dockerfile index 0946d735a4..31827cd323 100644 --- a/docker/faucet/Dockerfile +++ b/docker/faucet/Dockerfile @@ -21,4 +21,3 @@ RUN yarn build FROM nginx:alpine COPY --from=builder /app/apps/faucet/build /usr/share/nginx/html -COPY ./docker/faucet/nginx.conf /etc/nginx/conf.d/default.conf diff --git a/docker/faucet/nginx.conf b/docker/faucet/nginx.conf deleted file mode 100644 index 51acaff2fd..0000000000 --- a/docker/faucet/nginx.conf +++ /dev/null @@ -1,11 +0,0 @@ -server { - listen 80; - server_name localhost; - location / { - root /usr/share/nginx/html; - index index.html index.htm; - try_files $uri $uri/ $uri.html /index.html; - } - gzip on; - gzip_types text/plain text/css application/javascript application/json application/vnd.ms-fontobject application/xml+rss application/atom+xml font/opentype font/ttf image/svg+xml; -} From 598dfe8eb54dffe8090682eb82fd5bd1bec6a7f6 Mon Sep 17 00:00:00 2001 From: Gianmarco Fraccaroli Date: Fri, 13 Sep 2024 16:36:21 +0200 Subject: [PATCH 6/9] feat: test --- docker/faucet/nginx.conf | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 docker/faucet/nginx.conf diff --git a/docker/faucet/nginx.conf b/docker/faucet/nginx.conf new file mode 100644 index 0000000000..f556f266e6 --- /dev/null +++ b/docker/faucet/nginx.conf @@ -0,0 +1,11 @@ +server { + listen 80; + server_name localhost; + location / { + root /usr/share/nginx/html; + index index.html index.htm; + try_files /index.html; + } + gzip on; + gzip_types text/plain text/css application/javascript application/json application/vnd.ms-fontobject application/xml+rss application/atom+xml font/opentype font/ttf image/svg+xml; +} From 03d883880735ccea003e4cfeb910b9d00a1b156f Mon Sep 17 00:00:00 2001 From: Gianmarco Fraccaroli Date: Fri, 13 Sep 2024 16:45:51 +0200 Subject: [PATCH 7/9] feat: test --- docker/faucet/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/faucet/Dockerfile b/docker/faucet/Dockerfile index 31827cd323..0946d735a4 100644 --- a/docker/faucet/Dockerfile +++ b/docker/faucet/Dockerfile @@ -21,3 +21,4 @@ RUN yarn build FROM nginx:alpine COPY --from=builder /app/apps/faucet/build /usr/share/nginx/html +COPY ./docker/faucet/nginx.conf /etc/nginx/conf.d/default.conf From 48f24de4f2aec6ee1c90dfc0b5eb6d3895ce26c4 Mon Sep 17 00:00:00 2001 From: Gianmarco Fraccaroli Date: Fri, 13 Sep 2024 16:55:02 +0200 Subject: [PATCH 8/9] feat: test --- docker/faucet/nginx.conf | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/docker/faucet/nginx.conf b/docker/faucet/nginx.conf index f556f266e6..2dbd0a8caf 100644 --- a/docker/faucet/nginx.conf +++ b/docker/faucet/nginx.conf @@ -4,8 +4,7 @@ server { location / { root /usr/share/nginx/html; index index.html index.htm; - try_files /index.html; + try_files $uri $uri/ =404; } - gzip on; - gzip_types text/plain text/css application/javascript application/json application/vnd.ms-fontobject application/xml+rss application/atom+xml font/opentype font/ttf image/svg+xml; + gzip off; } From d7308e263b81340dd1bb93a1719360d6bd46c831 Mon Sep 17 00:00:00 2001 From: Gianmarco Fraccaroli Date: Fri, 13 Sep 2024 17:09:06 +0200 Subject: [PATCH 9/9] feat: test --- docker/faucet/nginx.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/faucet/nginx.conf b/docker/faucet/nginx.conf index 2dbd0a8caf..9d122fdd20 100644 --- a/docker/faucet/nginx.conf +++ b/docker/faucet/nginx.conf @@ -4,6 +4,7 @@ server { location / { root /usr/share/nginx/html; index index.html index.htm; + rewrite ^([^.]*[^/])$ $1/ permanent; try_files $uri $uri/ =404; } gzip off;