diff --git a/.github/workflows/docker-image-cuttingedge.yml b/.github/workflows/docker-image-cuttingedge.yml index 49f00d9..9a7e914 100644 --- a/.github/workflows/docker-image-cuttingedge.yml +++ b/.github/workflows/docker-image-cuttingedge.yml @@ -23,7 +23,6 @@ jobs: - name: Set up Docker Buildx id: buildx uses: docker/setup-buildx-action@v3.3.0 - # 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/build-push-action@v4.1.1 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 diff --git a/.github/workflows/docker-image-dev.yml b/.github/workflows/docker-image-dev.yml index 0351341..de9a36b 100644 --- a/.github/workflows/docker-image-dev.yml +++ b/.github/workflows/docker-image-dev.yml @@ -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/build-push-action@v4.1.1 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 diff --git a/.github/workflows/docker-image-master.yml b/.github/workflows/docker-image-master.yml index 2bdf043..c57ab15 100644 --- a/.github/workflows/docker-image-master.yml +++ b/.github/workflows/docker-image-master.yml @@ -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/build-push-action@v4.1.1 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 diff --git a/Dockerfile b/Dockerfile index 301ef05..b29e186 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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;"]