Merge branch 'main' into develop

.gitea/workflows/build-and-publish.yml

@@ -55,8 +55,6 @@ jobs:
           file: ./Dockerfile
           push: true
           tags: ${{ steps.set_tags.outputs.image_tags }}
-          env:
-            NPM_TOKEN: ${{secrets.NPM_TOKEN}}
 
       - name: Set Portainer Webhook URL
         run: |

.npmrc

@@ -1,2 +1 @@
 @3t.network:registry=https://git.3t.network/api/packages/3t.network/npm/
-//git.3t.network/api/packages/3t.network/npm/:_authToken=${NPM_TOKEN}

Dockerfile

@@ -13,7 +13,7 @@ WORKDIR /app
 FROM base AS build
 
 # Create app directory and copy the app
-COPY package*.json tsconfig.json ./
+COPY package*.json tsconfig.json .npmrc ./
 
 # Install
 RUN npm install
@@ -28,8 +28,8 @@ RUN npm run build
 FROM node:lts-alpine
 
 # Install dependencies but skip dev dependencies
-COPY --from=build /app/package*.json ./
+COPY --from=build /app/package*.json /app/.npmrc ./
-RUN npm install --only=production
+RUN npm install --only=production --omit=dev
 
 # Copy the app
 COPY --from=build /app/dist ./dist

scripts/build.sh

@@ -51,6 +51,7 @@ fi
 
 # cd to the project root directory.
 cd "$(dirname "$0")/.."
+source .env
 docker build -t butlerbot:$VERSION .
 
 # Tag the Docker image.