Merge branch 'main' of https://gitlab.coko.foundation/kotahi/kotahi into main

.gitlab-ci.coko.yml

@@ -23,7 +23,7 @@ build:
     - |
       if [ -z "$DOCKERHUB_USERNAME" ] || [ -z "$DOCKERHUB_PASSWORD" ]; then echo "Not pushing" && exit 0; fi
       docker login -u $DOCKERHUB_USERNAME -p $DOCKERHUB_PASSWORD
-      docker build --build-arg instance_name=coko --build-arg node_env=production --build-arg server_protocol=http --build-arg server_host=0.0.0.0 --build-arg server_port=3000 --build-arg client_host=0.0.0.0 --build-arg client_protocol=http --build-arg client_port=4000 --file ./Dockerfile-ci --cache-from $IMAGE_ORG/$IMAGE_NAME:latest --tag $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA --tag $IMAGE_ORG/$IMAGE_NAME:latest .   
+      docker build --file ./Dockerfile-ci --cache-from $IMAGE_ORG/$IMAGE_NAME:latest --tag $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA --tag $IMAGE_ORG/$IMAGE_NAME:latest .   
       docker push $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA
       docker push $IMAGE_ORG/$IMAGE_NAME:latest
 

.gitlab-ci.elife.yml

@@ -23,14 +23,6 @@ build:
       docker login -u $DOCKERHUB_USERNAME_ELIFE -p $DOCKERHUB_PASSWORD_ELIFE
       docker pull $IMAGE_ORG/$IMAGE_NAME:latest || true
       docker build \
-      --build-arg instance_name=elife \
-      --build-arg node_env=production \
-      --build-arg server_protocol= \
-      --build-arg server_host=localhost \
-      --build-arg server_port=3000 \
-      --build-arg client_protocol=http \
-      --build-arg client_host=0.0.0.0 \
-      --build-arg client_port=4000 \
       --file ./Dockerfile-production \
       --cache-from $CI_REGISTRY_IMAGE:latest \
       --tag $IMAGE_ORG/$IMAGE_NAME:$CI_COMMIT_SHA \

Dockerfile-ci

 FROM cypress/browsers:node14.16.0-chrome89-ff86
 
+ENV NODE_ENV "development"
+ENV SERVER_PROTOCOL "http"
+ENV SERVER_HOST "0.0.0.0"
+ENV SERVER_PORT "3000"
+ENV CLIENT_PROTOCOL "http"
+ENV CLIENT_HOST "0.0.0.0"
+ENV CLIENT_PORT "4000"
+ENV INSTANCE_NAME "coko"
 ENV HOME "/home/simplej"
+
 RUN mkdir -p ${HOME}
 WORKDIR ${HOME}
 
-ENV NODE_ENV "development"
-
 # Only copy things needed for the yarn install
 COPY package.json yarn.lock ./
 

Dockerfile-production

@@ -18,23 +18,14 @@ RUN yarn install --frozen-lockfile --production=false
 
 COPY . .
 
-ARG node_env
-ARG server_protocol
-ARG server_host
-ARG server_port
-ARG client_protocol
-ARG client_host
-ARG client_port
-ARG instance_name
-
-ENV NODE_ENV=$node_env
-ENV SERVER_PROTOCOL=$server_protocol
-ENV SERVER_HOST=$server_host
-ENV SERVER_PORT=$server_port
-ENV CLIENT_PROTOCOL=$client_protocol
-ENV CLIENT_HOST=$client_host
-ENV CLIENT_PORT=$client_port
-ENV INSTANCE_NAME=$instance_name
+ENV INSTANCE_NAME "elife"
+ENV NODE_ENV "production"
+ENV SERVER_PROTOCOL "http"
+ENV SERVER_HOST "localhost"
+ENV SERVER_PORT "3000"
+ENV CLIENT_PROTOCOL "http"
+ENV CLIENT_HOST "0.0.0.0"
+ENV CLIENT_PORT "4000"
 
 RUN yarn webpack --config webpack/webpack.production.config.js