Merge pull request #1942 from ever-co/develop

Release

.github/workflows/docker-build-publish-dev.yml

@@ -11,6 +11,9 @@ concurrency:
 jobs:
   ever-teams-webapp:
     runs-on: buildjet-8vcpu-ubuntu-2204
+
+    environment: dev
+
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -21,6 +24,9 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
+      - name: Output NEXT_PUBLIC_GAUZY_API_SERVER_URL
+        run: echo "NEXT_PUBLIC_GAUZY_API_SERVER_URL=${{ secrets.NEXT_PUBLIC_GAUZY_API_SERVER_URL }}"
+
       - name: Build and push
         uses: docker/build-push-action@v4
         with:

.github/workflows/docker-build-publish-prod.yml

@@ -11,6 +11,9 @@ concurrency:
 jobs:
   ever-teams-webapp:
     runs-on: buildjet-8vcpu-ubuntu-2204
+
+    environment: prod
+
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -21,6 +24,9 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
+      - name: Output NEXT_PUBLIC_GAUZY_API_SERVER_URL
+        run: echo "NEXT_PUBLIC_GAUZY_API_SERVER_URL=${{ secrets.NEXT_PUBLIC_GAUZY_API_SERVER_URL }}"
+
       - name: Build and push
         uses: docker/build-push-action@v4
         with:

Dockerfile

@@ -21,6 +21,9 @@ ARG NEXT_PUBLIC_CHATWOOT_API_KEY
 
 FROM node:${NODE_VERSION}-slim as base
 
+# Output the environment variable value
+RUN echo "NEXT_PUBLIC_GAUZY_API_SERVER_URL=${NEXT_PUBLIC_GAUZY_API_SERVER_URL}"
+
 LABEL maintainer="[email protected]"
 LABEL org.opencontainers.image.source https://github.com/ever-co/ever-teams
 
@@ -78,6 +81,8 @@ COPY . .
 
 ENV NODE_ENV=production
 
+RUN echo $NEXT_PUBLIC_GAUZY_API_SERVER_URL
+
 # Build application
 RUN yarn run build:web
 

Layerfile

@@ -11,10 +11,8 @@ RUN apt-get update && \
     apt-get update && \
     apt-get install docker-ce docker-ce-cli containerd.io
 
-COPY . .
+RUN REPEATABLE docker pull everco/ever-teams-webapp
 
-RUN REPEATABLE docker build -t ever-teams .
-
-RUN REPEATABLE docker run -d -p 3000:3000 ever-teams  && sleep 5
+RUN REPEATABLE docker run -d -p 3000:3000 everco/ever-teams-webapp  && sleep 5
 
 EXPOSE WEBSITE localhost:3000

Layerfile.build

@@ -0,0 +1,22 @@
+FROM vm/ubuntu:18.04
+
+MEMORY 8G
+
+# install the latest version of Docker, as in the official Docker installation tutorial.
+RUN apt-get update && \
+    apt-get install ca-certificates curl gnupg lsb-release && \
+    sudo mkdir -p /etc/apt/keyrings && \
+    curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo gpg --dearmor -o /etc/apt/keyrings/docker.gpg && \
+    echo \
+    "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" |\
+    sudo tee /etc/apt/sources.list.d/docker.list > /dev/null && \
+    apt-get update && \
+    apt-get install docker-ce docker-ce-cli containerd.io
+
+COPY . .
+
+RUN REPEATABLE docker build -t ever-teams .
+
+RUN REPEATABLE docker run -d -p 3000:3000 ever-teams && sleep 5
+
+EXPOSE WEBSITE localhost:3000

Layerfile.node

@@ -0,0 +1,22 @@
+FROM vm/ubuntu:22.04
+
+ENV NODE_MAJOR=20
+
+# install the latest version of Docker, as in the official Docker installation tutorial.
+RUN apt-get update &&\
+    apt-get install -y ca-certificates curl gnupg &&\
+    sudo mkdir -p /etc/apt/keyrings &&\
+    curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | sudo gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg &&\
+    echo \
+    "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" |\
+    sudo tee /etc/apt/sources.list.d/nodesource.list &&\
+    apt-get update &&\
+    apt-get install nodejs yarn -y
+
+COPY . .
+
+RUN REPEATABLE cd apps/web && yarn install && yarn build
+
+RUN BACKGROUND yarn start:web
+
+EXPOSE WEBSITE localhost:3000

apps/web/next.config.js

@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 const path = require('path');
 
-console.log(`GAUZY_API_SERVER_URL: ${process.env.GAUZY_API_SERVER_URL}`);
 console.log(`NEXT_PUBLIC_GAUZY_API_SERVER_URL: ${process.env.NEXT_PUBLIC_GAUZY_API_SERVER_URL}`);
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires