Merge pull request #226 from makeopensource/develop

Deploy current version of develop to main

Author: jessehartloff

.DS_Store

@@ -1,3 +1,4 @@
 /**/node_modules
 /logs
-/devU-api/src/tango/tests/test_files
+/devU-api/src/tango/tests/test_files
+.env.*

.dockerignore

@@ -0,0 +1,50 @@
+# Builds DevU api
+name: Build DevU api
+
+on:
+  push:
+    paths:
+      - 'devU-api/**'
+    branches:
+      - develop # add more branches as needed
+
+jobs:
+  build-api-docker:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write # to be able to publish a GitHub release
+      packages: write # to be able to publish docker image packages
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GHCR registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Convert image name to lowercase
+        run: |
+          original_string=${{ github.repository }}
+          echo "repo_url=$(echo $original_string | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
+
+      - name: Get Branch Name
+        id: get_branch
+        run: echo "::set-output name=branch_name::${GITHUB_REF#refs/heads/}"
+
+      - name: build api docker
+        run: |
+          IMAGE_NAME=ghcr.io/${{ env.repo_url }}/api:${{ steps.get_branch.outputs.branch_name }}
+          echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV
+
+          docker build . -f api.Dockerfile -t $IMAGE_NAME
+          docker push $IMAGE_NAME
+
+      - name: build tango docker
+        run: |
+          IMAGE_NAME=ghcr.io/${{ env.repo_url }}/tango:${{ steps.get_branch.outputs.branch_name }}
+          docker build ./tango -f ./tango/Dockerfile -t $IMAGE_NAME
+          docker push $IMAGE_NAME

.github/workflows/api.yml

@@ -0,0 +1,52 @@
+# Builds DevU client
+name: Build DevU client
+
+on:
+  push:
+    paths:
+      - 'devU-client/**'
+    branches:
+      - develop # add more branches as needed
+
+jobs:
+  build-client-docker:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write # to be able to publish a GitHub release
+      packages: write # to be able to publish packages
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: recursive
+          fetch-depth: 0
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Login to GHCR registry
+        run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u ${{ github.actor }} --password-stdin
+
+      - name: Convert image name to lowercase
+        run: |
+          original_string=${{ github.repository }}
+          echo "repo_url=$(echo $original_string | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
+
+      - name: Get Branch Name
+        id: get_branch
+        run: echo "::set-output name=branch_name::${GITHUB_REF#refs/heads/}"
+
+      - name: build client docker
+        run: |
+          IMAGE_NAME=ghcr.io/${{ env.repo_url }}/client:${{ steps.get_branch.outputs.branch_name }}
+          echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV
+      
+          docker build . -f client.Dockerfile -t $IMAGE_NAME
+          docker push $IMAGE_NAME
+
+      - name: build nginx
+        run: |
+          IMAGE_NAME=ghcr.io/${{ env.repo_url }}/nginx:${{ steps.get_branch.outputs.branch_name }}
+          echo "IMAGE_NAME=$IMAGE_NAME" >> $GITHUB_ENV
+          
+          docker build . -f nginx.Dockerfile -t $IMAGE_NAME          
+          docker push $IMAGE_NAME

.github/workflows/client.yml

@@ -4,4 +4,7 @@ node_modules/
 ./docker-compose.yml
 /.idea
 /.vscode
-/logs
+/logs
+/*/node_modules
+/*/package-lock.json
+levi

.gitignore

@@ -0,0 +1,14 @@
+{
+  "branches": [
+    {
+      "name": "release"
+    }
+  ],
+  "plugins": [
+    "@semantic-release/commit-analyzer",
+    "@semantic-release/release-notes-generator",
+    "@semantic-release/changelog",
+    "@semantic-release/github",
+    "@semantic-release/git"
+  ]
+}

.releaserc.json

@@ -1,28 +1,45 @@
-FROM node:16 as module_builder
+FROM node:22-alpine AS module_builder
 
 WORKDIR /tmp
 
-COPY ./devu-shared .
+COPY devU-shared .
 
 RUN npm install && \
     npm run clean-directory && \
     npm run build-docker
 
-FROM node:16
+FROM docker.io/python:alpine AS config-builder
+
+WORKDIR /config
+
+RUN apk add --no-cache bash jq openssl \
+  && pip install yq
+
+COPY devU-api/scripts/ .
+
+COPY devU-api/config/ ./config
+
+RUN ./generateConfig.sh default.yml
+
+FROM node:22-alpine
 
 WORKDIR /app
 
-COPY ./devU-api/package.json ./devU-api/package-lock.json ./
+COPY ./devU-api/package.json ./
 
 RUN npm install
 
 COPY ./devU-api .
 
+COPY --from=config-builder /config/default.yml ./config/default.yml
+
 COPY --from=module_builder /tmp/devu-shared-modules ./devu-shared-modules
 
+# Indicate that the api is running in docker; value here is irrelevant
+ENV IS_DOCKER=0
+
 ADD https://github.com/ufoscout/docker-compose-wait/releases/download/2.2.1/wait /wait
 RUN chmod +x /wait
 
 # TypeORM Migrations
-CMD /wait && npm run typeorm -- migration:run && npm start
-
+CMD /wait && npm run typeorm -- migration:run -d src/database.ts && npm start

api.Dockerfile

@@ -1,25 +1,24 @@
-FROM node:16 as module_builder
+FROM node:22-alpine AS module_builder
 
 WORKDIR /tmp
 
-COPY ./devu-shared .
+COPY devU-shared .
 
 RUN npm install && \
     npm run clean-directory && \
     npm run build-docker
 
-FROM node:16
+FROM node:22-alpine
 
 WORKDIR /app
 
-COPY ./devU-client/package.json ./devU-client/package-lock.json ./
-
+COPY ./devU-client/package.json ./
 
 RUN npm install
 
 COPY ./devU-client/ .
 
 COPY --from=module_builder /tmp/devu-shared-modules ./devu-shared-modules
 
-RUN npm run build-local
-CMD cp -r /app/dist/* /out
+# build frontend during run so that we can modify baseurl via docker envoirment
+CMD npm run --silent build-docker && rm -rf /out/* && cp -r /app/dist/* /out

client.Dockerfile

@@ -3,6 +3,7 @@ build/
 env/
 .idea/
 /devu-shared-modules
+package-lock.json
 
 config/*.yml
 !config/test.yml

devU-api/.gitignore

@@ -6,6 +6,7 @@ declare global {
       // Auth Data
       currentUser?: AccessToken // Deserialized access token
       refreshUser?: RefreshToken // Deserialized refresh token
+      ownerId?: string // The owner of the requested resource(s)
     }
   }
 }