Update docker

aesirxio · Oct 16, 2023 · f7a0e81 · f7a0e81
1 parent 7fb43d0
commit f7a0e81
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 10 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,16 +21,6 @@ jobs:
 
       - run: git submodule update --init --recursive
 
-      - run: yarn install
-      - run: yarn lint:check
-      - run: CI=false yarn build
-      - uses: JS-DevTools/npm-publish@v2
-        with:
-          token: ${{ secrets.NPM_TOKEN }}
-          strategy: upgrade
-          ignore-scripts: false
-          package: ./packages/aesirx-dma-app
-
       - name: Docker meta
         id: meta
         uses: docker/metadata-action@v5
@@ -70,6 +60,16 @@ jobs:
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
 
+      - run: yarn install
+      - run: yarn lint:check
+      - run: CI=false yarn build
+      - uses: JS-DevTools/npm-publish@v2
+        with:
+          token: ${{ secrets.NPM_TOKEN }}
+          strategy: upgrade
+          ignore-scripts: false
+          package: ./packages/aesirx-dma-app
+
       - name: Release note
         uses: ncipollo/release-action@v1
         with:

diff --git a/Dockerfile b/Dockerfile
@@ -9,8 +9,20 @@ COPY yarn.lock .
 
 COPY ./packages/aesirx-dma-app/package.json ./packages/aesirx-dma-app/package.json
 COPY ./packages/aesirx-lib ./packages/aesirx-lib
+COPY ./packages/aesirx-sso ./packages/aesirx-sso
 COPY ./packages/aesirx-uikit ./packages/aesirx-uikit
 
+RUN apk add --update --no-cache \
+    make \
+    g++ \
+    jpeg-dev \
+    cairo-dev \
+    giflib-dev \
+    pango-dev \
+    libtool \
+    autoconf \
+    automake
+
 RUN yarn install --frozen-lockfile --network-timeout 600000
 
 ## Builder
@@ -22,6 +34,7 @@ RUN apk add --no-cache git
 # Cache and Install dependencies
 COPY --from=deps ./app/node_modules ./node_modules
 COPY --from=deps ./app/packages/aesirx-lib/dist ./packages/aesirx-lib/dist
+COPY --from=deps ./app/packages/aesirx-sso/build ./packages/aesirx-sso/build
 COPY --from=deps ./app/packages/aesirx-uikit/dist ./packages/aesirx-uikit/dist
 
 # Copy app files
@@ -30,6 +43,7 @@ COPY ./nx.json ./
 COPY ./package.json ./
 
 COPY ./packages/aesirx-lib/package.json ./packages/aesirx-lib/package.json
+COPY ./packages/aesirx-sso/package.json ./packages/aesirx-sso/package.json
 COPY ./packages/aesirx-uikit/package.json ./packages/aesirx-uikit/package.json
 
 COPY ./packages/aesirx-dma-app/package.json ./packages/aesirx-dma-app/