restructure and update arm build files

Dockerfile.armv6 → .docker/Dockerfile.armv6

@@ -1,23 +1,29 @@
 # Use a base image compatible with ARMv6 architecture
 FROM arm32v6/node:14-alpine
 
+# Install necessary build dependencies
+RUN apk add --no-cache make gcc g++ python3 linux-headers udev tzdata git
+
 # Set the working directory
 WORKDIR /app
 
 # Copy package.json and package-lock.json
 COPY package*.json ./
 
-# Install dependencies
-RUN npm install
+# Install dependencies (both development and production)
+RUN npm ci
 
 # Copy the rest of the application
 COPY . .
 
 # Build the application
 RUN npm run build
 
-# Expose the port
+# Set environment variables
+ENV NODE_ENV=production
+
+# Expose the port (if applicable)
 EXPOSE 4200
 
 # Command to run the application
-CMD ["npm", "start"]
+CMD ["node", "dist/app.js"]

Dockerfile.armv7 → .docker/Dockerfile.armv7

@@ -1,23 +1,29 @@
 # Use a base image compatible with ARMv7 architecture
 FROM arm32v7/node:14-alpine
 
+# Install necessary build dependencies
+RUN apk add --no-cache make gcc g++ python3 linux-headers udev tzdata git
+
 # Set the working directory
 WORKDIR /app
 
 # Copy package.json and package-lock.json
 COPY package*.json ./
 
-# Install dependencies
-RUN npm install
+# Install dependencies (both development and production)
+RUN npm ci
 
 # Copy the rest of the application
 COPY . .
 
 # Build the application
 RUN npm run build
 
-# Expose the port
+# Set environment variables
+ENV NODE_ENV=production
+
+# Expose the port (if applicable)
 EXPOSE 4200
 
 # Command to run the application
-CMD ["npm", "start"]
+CMD ["node", "dist/app.js"]

.github/workflows/docker-publish-njsPC-linux.yml

@@ -24,7 +24,7 @@ jobs:
       - name: Build and push Linux Docker image (x86_64)
         uses: docker/build-push-action@v4
         with:
-          context: .
+          context: ./.docker
           file: ./Dockerfile.linux
           push: true
           tags: |
@@ -33,7 +33,7 @@ jobs:
       - name: Build and push ARMv7 Docker image
         uses: docker/build-push-action@v4
         with:
-          context: .
+          context: ./.docker
           file: ./Dockerfile.armv7  # Adjust the path to your ARMv7 Dockerfile
           push: true
           tags: |
@@ -42,8 +42,14 @@ jobs:
       - name: Build and push ARMv6 Docker image
         uses: docker/build-push-action@v4
         with:
-          context: .
+          context: ./.docker
           file: ./Dockerfile.armv6  # Adjust the path to your ARMv6 Dockerfile
           push: true
           tags: |
             tagyoureit/nodejs-poolcontroller-armv6:latest
+
+            # Example of how to run docker-compose with the working directory specified
+            
+      - name: Run Docker Compose
+        run: docker-compose up -d
+        working-directory: .docker  # Specify the working directory here