Skip to content

Commit

Permalink
Updated configuration to allow build to complete
Browse files Browse the repository at this point in the history
  • Loading branch information
clyde-johnston committed Aug 10, 2023
1 parent b1f5b79 commit b75e096
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 22 deletions.
32 changes: 16 additions & 16 deletions .github/workflows/production.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,23 +12,23 @@ jobs:
steps:
-
name: Retrieve repository
uses: actions/checkout@v1
uses: actions/checkout@v3
-
name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
-
name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Build and push
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
context: deployment
file: deployment/Dockerfile
Expand All @@ -45,23 +45,23 @@ jobs:
steps:
-
name: Retrieve repository
uses: actions/checkout@v1
uses: actions/checkout@v3
-
name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
-
name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Build and push
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
context: nunaserver
file: nunaserver/Dockerfile
Expand All @@ -78,23 +78,23 @@ jobs:
steps:
-
name: Retrieve repository
uses: actions/checkout@v1
uses: actions/checkout@v3
-
name: Set up QEMU
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
uses: docker/setup-buildx-action@v2
-
name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
-
name: Build and push
id: docker_build
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
context: nunaweb
file: nunaweb/Dockerfile
Expand All @@ -117,7 +117,7 @@ jobs:
steps:
-
name: Retrieve repository
uses: actions/checkout@v1
uses: actions/checkout@v3
-
name: Copy docker-compose.yml file to host
uses: appleboy/scp-action@master
Expand Down
2 changes: 1 addition & 1 deletion deployment/docker-compose.prod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ services:
restart: always

minio:
image: minio/minio:latest
image: minio/minio:RELEASE.2022-10-24T18-35-07Z
restart: always
volumes:
- /var/lib/nunaweb:/data
Expand Down
3 changes: 1 addition & 2 deletions nunaserver/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,5 @@ FROM python:3.9.1-slim
EXPOSE 8080
COPY / /nunaserver/
WORKDIR /nunaserver
RUN apt update
RUN apt install -y curl
RUN apt-get update && apt-get install -y curl
RUN pip3 install -r requirements.txt
5 changes: 2 additions & 3 deletions nunaweb/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
FROM node:12-slim
FROM node:16
EXPOSE 8080
COPY . /nunaweb
WORKDIR /nunaweb
ENV API_URL="https://nunaweb.opencyphal.org/api/"
RUN apt update
RUN apt install -y curl
RUN apt-get update && apt-get install -y curl
RUN npm install
RUN npm run build
RUN npm run generate

0 comments on commit b75e096

Please sign in to comment.