-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #116 from vonProteus/arm64
Added support for ARM
- Loading branch information
Showing
4 changed files
with
6 additions
and
7 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,7 +23,6 @@ jobs: | |
| - name: Set up Docker Buildx | ||
| id: buildx | ||
| uses: docker/[email protected] | ||
|
|
||
| # https://github.com/docker/login-action#docker-hub | ||
| - name: Login to Docker Hub | ||
| uses: docker/login-action@v2 | ||
|
|
@@ -35,7 +34,7 @@ jobs: | |
| - name: Build and push Website | ||
| uses: docker/[email protected] | ||
| with: | ||
| context: ./Website | ||
| context: . | ||
| file: ./Dockerfile | ||
| #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6 | ||
| platforms: linux/amd64,linux/arm64 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,7 +2,7 @@ name: Docker Image CI | |
|
|
||
| on: | ||
| push: | ||
| branches: [ "cuttingedge" ] | ||
| branches: [ "dev" ] | ||
| workflow_dispatch: | ||
|
|
||
| jobs: | ||
|
|
@@ -35,8 +35,9 @@ jobs: | |
| - name: Build and push Website | ||
| uses: docker/[email protected] | ||
| with: | ||
| context: ./Website | ||
| context: . | ||
| file: ./Dockerfile | ||
| tags: glax/tranga-website:dev | ||
| #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6 | ||
| platforms: linux/amd64,linux/arm64 | ||
| pull: true | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,7 +24,7 @@ jobs: | |
| # https://github.com/marketplace/actions/docker-setup-buildx | ||
| - name: Set up Docker Buildx | ||
| id: buildx | ||
| uses: docker/setup-buildx-action@v3.1.0 | ||
| uses: docker/setup-buildx-action@v3.3.0 | ||
|
|
||
| # https://github.com/docker/login-action#docker-hub | ||
| - name: Login to Docker Hub | ||
|
|
@@ -37,7 +37,7 @@ jobs: | |
| - name: Build and push Website | ||
| uses: docker/[email protected] | ||
| with: | ||
| context: ./ | ||
| context: . | ||
| file: ./Dockerfile | ||
| #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6 | ||
| platforms: linux/amd64,linux/arm64 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,6 +1,5 @@ | ||
| FROM nginx:alpine3.17-slim | ||
| COPY ./Website /usr/share/nginx/html | ||
| COPY ./nginx /etc/nginx | ||
| EXPOSE 80 | ||
| ENV API_URL=http://tranga-api:6531 | ||
| CMD ["nginx", "-g", "daemon off;"] |