fixing container build tool

Author: marcolarosa

Dockerfile.tasks-build

@@ -1,6 +1,7 @@
 FROM --platform=$TARGETPLATFORM node:18-bullseye AS tasks-builder
 COPY tasks /srv/tasks
 COPY api /srv/api
+COPY configuration /srv/configuration
 WORKDIR /srv/tasks
 RUN npm install
 RUN npm run build:production

Dockerfile.ui-build

@@ -3,8 +3,8 @@ LABEL org.opencontainers.image.source=https://github.com/CoEDL/nyingarn-workspac
 LABEL org.opencontainers.image.description="The Nyingarn Workspace UI container"
 LABEL org.opencontainers.image.licenses=GPLv3
 
-RUN apt-get update && apt-get install -y nginx-extras
-RUN rm /etc/nginx/conf.d/default.conf /etc/nginx/sites-available/default /etc/nginx/sites-enabled/default
+# RUN apt-get update && apt-get install -y nginx-extras
+RUN rm /etc/nginx/conf.d/default.conf
 
 COPY ./ui/dist/ /srv/ui/
 

Dockerfile.ui-repository-build

@@ -0,0 +1,11 @@
+FROM nginx:latest
+LABEL org.opencontainers.image.source=https://github.com/CoEDL/nyingarn-workspace
+LABEL org.opencontainers.image.description="The Nyingarn Repository UI container"
+LABEL org.opencontainers.image.licenses=GPLv3
+
+# RUN apt-get update && apt-get install -y nginx-extras
+RUN rm /etc/nginx/conf.d/default.conf
+
+COPY ./ui-repository/dist/ /srv/ui/
+
+CMD ["nginx", "-g", "daemon off;"]

build-production-containers.sh

@@ -51,7 +51,7 @@ if [ "$resp" == "y" ] ; then
     docker run -it --rm \
         -v $PWD/ui:/srv/ui \
         -v ui_node_modules:/srv/ui/node_modules \
-        -w /srv/ui node:14-buster bash -l -c "npm run build"
+        -w /srv/ui node:18-bullseye bash -l -c "npm run build"
     docker buildx build --push --rm --platform linux/amd64 \
         -t ghcr.io/coedl/nyingarn-workspace-ui:latest \
         -t ghcr.io/coedl/nyingarn-workspace-ui:${VERSION} \
@@ -61,9 +61,9 @@ if [ "$resp" == "y" ] ; then
     docker run -it --rm \
         -v $PWD/ui-repository:/srv/ui \
         -v ui_node_modules:/srv/ui/node_modules \
-        -w /srv/ui node:14-buster bash -l -c "npm run build"
+        -w /srv/ui node:18-bullseye bash -l -c "npm run build"
     docker buildx build --push --rm --platform linux/amd64 \
-        -t ghcr.io/coedl/nyingarn-workspace-ui:latest \
-        -t ghcr.io/coedl/nyingarn-workspace-ui:${VERSION} \
+        -t ghcr.io/coedl/nyingarn-repository-ui:latest \
+        -t ghcr.io/coedl/nyingarn-repository-ui:${VERSION} \
         -f Dockerfile.ui-build .
 fi