diff --git a/.github/workflows/production.yml b/.github/workflows/production.yml index 6d0193d..2660d93 100644 --- a/.github/workflows/production.yml +++ b/.github/workflows/production.yml @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/deployment/docker-compose.prod.yml b/deployment/docker-compose.prod.yml index 88e1489..855aa10 100644 --- a/deployment/docker-compose.prod.yml +++ b/deployment/docker-compose.prod.yml @@ -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 diff --git a/nunaserver/Dockerfile b/nunaserver/Dockerfile index 18b10fc..a895cc7 100644 --- a/nunaserver/Dockerfile +++ b/nunaserver/Dockerfile @@ -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 diff --git a/nunaweb/Dockerfile b/nunaweb/Dockerfile index 378cb87..32bf52d 100644 --- a/nunaweb/Dockerfile +++ b/nunaweb/Dockerfile @@ -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