feat: unified docker image

.dockerignore

@@ -3,4 +3,4 @@
 !migrate-mongo-config.js
 !migrations
 !build
-**/*.js.map
+!docker/files

.github/workflows/main.yml

@@ -4,6 +4,8 @@ env:
   GITHUB_REPOSITORY_SSH_URL: "git@github.com:${{ github.repository }}.git"
   TMP_DOCKER_IMAGE: "getmeli/api/${{ github.ref }}"
   DOCKER_IMAGE: "getmeli/api"
+  TMP_DOCKER_IMAGE_UNIFIED: "getmeli/meli/${{ github.ref }}"
+  DOCKER_IMAGE_UNIFIED: "getmeli/meli"
   IS_RELEASE_BRANCH: "${{ github.ref == 'refs/heads/latest' || github.ref == 'refs/heads/next' || github.ref == 'refs/heads/beta' }}"
 jobs:
   build:
@@ -35,7 +37,11 @@ jobs:
             npm version --no-git-tag-version $(cat VERSION) --allow-same-version
           fi
           npm run build
-          docker build -t $TMP_DOCKER_IMAGE .
+      - name: "docker build"
+        run: |
+          docker build -t $TMP_DOCKER_IMAGE -f ./docker/Dockerfile .
+          # TODO UI_VERSION=get channel from semantic-release
+          docker build -t $TMP_DOCKER_IMAGE_UNIFIED -f ./docker/unified.Dockerfile --build-arg=UI_VERSION=TODO .
       - name: "release"
         if: ${{ env.IS_RELEASE_BRANCH == 'true' }}
         run: |
@@ -48,7 +54,9 @@ jobs:
         if: ${{ env.IS_RELEASE_BRANCH == 'true' }}
         run: |
           docker login -u $DOCKER_USER -p $DOCKER_TOKEN
+          HEAD_BRANCH=`echo "${GITHUB_REF//refs\/heads\//}" | tr -d '\n'`
           npx docker-semver-tags --sourceImage $TMP_DOCKER_IMAGE --targetImage $DOCKER_IMAGE --versionTag $(cat VERSION)
+          npx docker-semver-tags --sourceImage $TMP_DOCKER_IMAGE_UNIFIED --targetImage $DOCKER_IMAGE_UNIFIED --versionTag $(cat VERSION) --build-arg="$HEAD_BRANCH"
         env:
           DOCKER_TOKEN: ${{ secrets.DOCKER_TOKEN }}
           DOCKER_USER: ${{ secrets.DOCKER_USER }}

.releaserc.js

@@ -1,9 +1,18 @@
 module.exports = {
   branches: [
     { name: 'latest' },
-    { name: 'beta', prerelease: true },
-    { name: 'next', prerelease: true },
-    { name: 'tmp', prerelease: true },
+    {
+      name: 'beta',
+      prerelease: true,
+    },
+    {
+      name: 'next',
+      prerelease: true,
+    },
+    {
+      name: 'tmp',
+      prerelease: true,
+    },
   ],
   plugins: [
     '@semantic-release/commit-analyzer',

Dockerfile → docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM node:12-alpine
 
-COPY ./build/ /app/
+COPY ./build /app/
 COPY ./node_modules /app/node_modules
 COPY ./migrate-mongo-config.js /app/
 

docker/files/caddy-config.json

@@ -0,0 +1,6 @@
+{
+  "admin": {
+    "disabled": false,
+    "listen": "0.0.0.0:2019"
+  }
+}

docker/files/entrypoint.sh

@@ -0,0 +1,6 @@
+#!/usr/bin/env sh
+set -e
+
+caddy start --config /etc/caddy/config.json
+
+exec "$@"

docker/files/env.json

@@ -0,0 +1,3 @@
+{
+  "MELI_API_URL": "http://localhost:3001"
+}

docker/unified.Dockerfile

@@ -0,0 +1,35 @@
+ARG UI_VERSION=latest
+
+# https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact
+FROM getmeli/ui:${UI_VERSION} AS ui
+
+FROM caddy:2
+
+# caddy
+COPY ./docker/files/entrypoint.sh /entrypoint.sh
+COPY ./docker/files/caddy-config.json /etc/caddy/config.json
+# ui
+COPY --from=ui /www /app/ui
+# api
+COPY ./build /app/api
+COPY ./node_modules /app/api/node_modules
+COPY ./migrate-mongo-config.js /app/api
+
+RUN chmod +x /entrypoint.sh \
+  && apk add --no-cache \
+       bash \
+       nodejs \
+  && mkdir -p /app/api/migrations
+
+WORKDIR /app
+
+LABEL maintainer="meli.sh"
+
+ENV MELI_URL_INTERNAL=http://localhost:3001
+ENV MELI_UI_DIR=/app/ui
+
+EXPOSE 80
+EXPOSE 443
+
+ENTRYPOINT ["/entrypoint.sh"]
+CMD ["node", "api/index.js"]

src/env.ts

@@ -87,22 +87,22 @@ const envSpec: EnvSpec<Env> = {
     schema: string().required(),
   },
   MELI_URL_INTERNAL: {
-    schema: string().optional().custom(isUrl).default(process.env.MELI_URL),
+    schema: string().optional().custom(isUrl).default(process.env.MELI_URL || null),
   },
   MELI_UI_URL: {
-    schema: string().optional().custom(isUrl).default(process.env.MELI_URL),
+    schema: string().optional().custom(isUrl).default(process.env.MELI_URL || null),
   },
   MELI_UI_URL_INTERNAL: {
-    schema: string().optional().custom(isUrl).default(process.env.MELI_URL),
+    schema: string().optional().custom(isUrl).default(process.env.MELI_URL || null),
   },
   MELI_SITES_URL: {
-    schema: string().optional().custom(isUrl).default(process.env.MELI_URL),
+    schema: string().optional().custom(isUrl).default(process.env.MELI_URL || null),
   },
   MELI_UI_DIR: {
     schema: string().optional(),
   },
   MELI_JWT_SECRET: {
-    schema: string(),
+    schema: string().required(),
   },
   MELI_JWT_TOKEN_EXPIRATION: {
     transform: stringToInt(),
@@ -142,7 +142,7 @@ const envSpec: EnvSpec<Env> = {
     schema: string().optional(),
   },
   MELI_MONGO_URI: {
-    schema: string(),
+    schema: string().required(),
   },
   MELI_MIGRATE_ROLLBACK: {
     transform: stringToBoolean(),
@@ -274,7 +274,7 @@ const envSpec: EnvSpec<Env> = {
     schema: string().optional().default('/sites'),
   },
   MELI_SITES_DIR: {
-    schema: string().required().default('/sites'),
+    schema: string().optional().default('/sites'),
   },
   MELI_CADDY_ADMIN_API_URL: {
     schema: string().default('http://localhost:2019'),