From 2c0f2795cb55299693d2b7e43d1408677ff397ce Mon Sep 17 00:00:00 2001 From: Michael Schramm Date: Mon, 1 Jun 2020 22:11:00 +0200 Subject: [PATCH] add fixed image --- Dockerfile | 63 ++++++---------------------------------------- docker-compose.yml | 56 ++++++++++++++++++++--------------------- 2 files changed, 35 insertions(+), 84 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4f953c1a..a81ae6f4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,58 +1,9 @@ -FROM node:10-alpine +FROM ohmyform/ui as builder + +RUN yarn export + +FROM ohmyform/api + LABEL maintainer="OhMyForm " -# Create a group and a user with name "ohmyform". -RUN addgroup --gid 9999 ohmyform && adduser -D --uid 9999 -G ohmyform ohmyform - -# Install some needed packages -RUN apk add --no-cache git python \ - && rm -rf /tmp/* \ - && npm install --quiet -g grunt@1.0.4 bower@1.8.8 pm2@3.5.1 \ - && npm cache clean --force \ - && mkdir -p /opt/app/public/lib - -# to expose the public folder to other containers -# VOLUME /opt/app - -WORKDIR /opt/app - -## TODO: Find a method that's better than this for passing ENV's if possible. -# Set default ENV -ENV NODE_ENV=development \ - SECRET_KEY=ChangeMeChangeMe \ - PORT=5000 \ - BASE_URL=localhost \ - SOCKET_PORT=20523 \ - SIGNUP_DISABLED=FALSE \ - SUBDOMAINS_DISABLED=TRUE \ - ENABLE_CLUSTER_MODE=FALSE \ - MAILER_EMAIL_ID=ohmyform@localhost \ - MAILER_PASSWORD="" \ - MAILER_FROM=ohmyform@localhost \ - MAILER_SERVICE_PROVIDER="" \ - MAILER_SMTP_HOST="" \ - MAILER_SMTP_PORT="" \ - MAILER_SMTP_SECURE="" \ - CREATE_ADMIN=FALSE \ - ADMIN_EMAIL=admin@ohmyform.com \ - ADMIN_USERNAME=root \ - ADMIN_PASSWORD=root \ - APP_NAME=OhMyForm \ - APP_KEYWORDS="" \ - APP_DESC="" \ - COVERALLS_REPO_TOKEN="" \ - GOOGLE_ANALYTICS_ID="" \ - RAVEN_DSN="" - -# keep .dockerignore up to date -COPY . . - -RUN npm install --only=production \ - && bower install --allow-root -f \ - && grunt build - -# Change to non-root privilege -USER ohmyform - -# Run OhMyForm server -CMD ["node", "server.js"] +COPY --from=builder /usr/src/app/out /usr/src/app/public diff --git a/docker-compose.yml b/docker-compose.yml index 22ed0e4c..1ad878e6 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,46 +7,46 @@ services: image: mongo volumes: - "./data/mongo:/data" -# ohmyform: -# build: . -# environment: -# CREATE_ADMIN: "TRUE" -# MONGODB_URI: mongodb://mongo/ohmyform -# MAILER_URI: smtp://mail:1025 -# PORT: 5000 -# links: -# - mongo -# - redis -# - mail -# ports: -# - "5200:5000" -# depends_on: -# - mongo -# - redis - ui: - image: ohmyform/ui + ohmyform: + build: . environment: - API_HOST: http://localhost:5100/graphql - PORT: 5000 - ports: - - "5000:5000" - api: - image: ohmyform/api - environment: - CREATE_ADMIN: "true" + CREATE_ADMIN: "TRUE" MONGODB_URI: mongodb://mongo/ohmyform MAILER_URI: smtp://mail:1025 - REDIS_URL: redis://redis PORT: 5000 links: - mongo - redis - mail ports: - - "5100:5000" + - "5000:5000" depends_on: - mongo - redis +# ui: +# image: ohmyform/ui +# environment: +# API_HOST: http://localhost:5100/graphql +# PORT: 5000 +# ports: +# - "5000:5000" +# api: +# image: ohmyform/api +# environment: +# CREATE_ADMIN: "true" +# MONGODB_URI: mongodb://mongo/ohmyform +# MAILER_URI: smtp://mail:1025 +# REDIS_URL: redis://redis +# PORT: 5000 +# links: +# - mongo +# - redis +# - mail +# ports: +# - "5100:5000" +# depends_on: +# - mongo +# - redis mail: image: mailhog/mailhog ports: