chore(#439): wip app container

druxt · Sep 5, 2022 · 6d0c6fe · 6d0c6fe
1 parent 0e95059
commit 6d0c6fe
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 29 deletions.
diff --git a/.docker/Dockerfile.app b/.docker/Dockerfile.app
@@ -12,13 +12,4 @@ ENV GITHUB_CLIENT_ID ${GITHUB_CLIENT_ID}
 ENV GITHUB_CLIENT_SECRET ${GITHUB_CLIENT_SECRET}
 ENV OAUTH_CLIENT_ID ${OAUTH_CLIENT_ID}
 
-RUN npm run generate
-
-FROM uselagoon/nginx:latest
-
-COPY --from=builder /app/dist /app/
-
-COPY nginx.conf /etc/nginx/conf.d/app.conf
-
-ENV HOST 0.0.0.0
-EXPOSE 8080
+CMD ['yarn', 'generate', '&&', 'yarn', 'start']
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -73,25 +73,25 @@ services:
     # environment:
     #   << : *default-environment
 
-  # app:
-  #   networks:
-  #     - amazeeio-network
-  #     - default
-  #   build:
-  #     context: .
-  #     dockerfile: .docker/Dockerfile.app
-  #     args:
-  #       GITHUB_CLIENT_ID: ${GITHUB_CLIENT_ID}
-  #       GITHUB_CLIENT_SECRET: ${GITHUB_CLIENT_SECRET}
-  #       OAUTH_CLIENT_ID: ${OAUTH_CLIENT_ID}
-  #   labels:
-  #     lagoon.type: nginx
-  #     lando.type: nginx
-  #   volumes:
-  #     - ./nuxt/dist:/app:delegated
-  #   environment:
-  #     LAGOON_LOCALDEV_HTTP_PORT: 8080
-  #     LAGOON_ROUTE: http://demo-druxtjs-org.docker.amazee.io
+  app:
+    networks:
+      - amazeeio-network
+      - default
+    build:
+      context: .
+      dockerfile: .docker/Dockerfile.app
+      args:
+        GITHUB_CLIENT_ID: ${GITHUB_CLIENT_ID}
+        GITHUB_CLIENT_SECRET: ${GITHUB_CLIENT_SECRET}
+        OAUTH_CLIENT_ID: ${OAUTH_CLIENT_ID}
+    labels:
+      lagoon.type: nginx
+      lando.type: nginx
+    volumes:
+      - ./nuxt/dist:/app:delegated
+    environment:
+      LAGOON_LOCALDEV_HTTP_PORT: 8080
+      LAGOON_ROUTE: http://demo-druxtjs-org.docker.amazee.io
 
   storybook:
     networks: