From 0e9505918dc27bd247c29e0fd37ec45142e9e7ec Mon Sep 17 00:00:00 2001 From: Stuart Clark Date: Tue, 9 Aug 2022 12:13:49 +1000 Subject: [PATCH] chore(#439): update storybook container --- .docker/Dockerfile.storybook | 6 +++--- docker-compose.yml | 38 ++++++++++++++++++------------------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/.docker/Dockerfile.storybook b/.docker/Dockerfile.storybook index 53517c17..b0409e1b 100644 --- a/.docker/Dockerfile.storybook +++ b/.docker/Dockerfile.storybook @@ -1,8 +1,8 @@ FROM amazeeio/node:14 -COPY . /app/ +COPY ./nuxt/ /app/ -RUN npm install --legacy-peer-deps +RUN yarn ARG GITHUB_CLIENT_ID ARG GITHUB_CLIENT_SECRET @@ -17,4 +17,4 @@ EXPOSE 3000 WORKDIR /app -CMD ["npx", "nuxt", "storybook", "-p", "3000"] +CMD ["yarn", "storybook", "-p", "3000"] diff --git a/docker-compose.yml b/docker-compose.yml index add2305d..4d8973a4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -93,25 +93,25 @@ services: # LAGOON_LOCALDEV_HTTP_PORT: 8080 # LAGOON_ROUTE: http://demo-druxtjs-org.docker.amazee.io - # storybook: - # networks: - # - amazeeio-network - # - default - # build: - # context: ./nuxt - # dockerfile: ../.docker/Dockerfile.storybook - # args: - # GITHUB_CLIENT_ID: ${GITHUB_CLIENT_ID} - # GITHUB_CLIENT_SECRET: ${GITHUB_CLIENT_SECRET} - # OAUTH_CLIENT_ID: ${OAUTH_CLIENT_ID} - # labels: - # lagoon.type: node - # lando.type: node - # volumes: - # - ./nuxt/dist:/app:delegated - # environment: - # LAGOON_LOCALDEV_HTTP_PORT: 3003 - # LAGOON_ROUTE: http://storybook-demo-druxtjs-org.docker.amazee.io + storybook: + networks: + - amazeeio-network + - default + build: + context: . + dockerfile: .docker/Dockerfile.storybook + args: + GITHUB_CLIENT_ID: ${GITHUB_CLIENT_ID} + GITHUB_CLIENT_SECRET: ${GITHUB_CLIENT_SECRET} + OAUTH_CLIENT_ID: ${OAUTH_CLIENT_ID} + labels: + lagoon.type: node + lando.type: node + volumes: + - ./nuxt/dist:/app:delegated + environment: + LAGOON_LOCALDEV_HTTP_PORT: 3003 + LAGOON_ROUTE: http://storybook-demo-druxtjs-org.docker.amazee.io networks: amazeeio-network: