From 989de51a24ff5530631c73f2eb74de97b3b3660e Mon Sep 17 00:00:00 2001 From: Daniel Hougaard Date: Fri, 8 Nov 2024 10:58:26 +0400 Subject: [PATCH] cleanup --- Dockerfile.standalone-infisical | 14 +++++++ docker-compose.hsm.prod.yml | 74 --------------------------------- 2 files changed, 14 insertions(+), 74 deletions(-) delete mode 100644 docker-compose.hsm.prod.yml diff --git a/Dockerfile.standalone-infisical b/Dockerfile.standalone-infisical index 269cbfcf9c..1a6775c98c 100644 --- a/Dockerfile.standalone-infisical +++ b/Dockerfile.standalone-infisical @@ -72,6 +72,13 @@ RUN addgroup --system --gid 1001 nodejs \ WORKDIR /app +# Required for pkcs11js +RUN apt-get update && apt-get install -y \ + python3 \ + make \ + g++ \ + && rm -rf /var/lib/apt/lists/* + COPY backend/package*.json ./ RUN npm ci --only-production @@ -85,6 +92,13 @@ FROM base AS backend-runner WORKDIR /app +# Required for pkcs11js +RUN apt-get update && apt-get install -y \ + python3 \ + make \ + g++ \ + && rm -rf /var/lib/apt/lists/* + COPY backend/package*.json ./ RUN npm ci --only-production diff --git a/docker-compose.hsm.prod.yml b/docker-compose.hsm.prod.yml deleted file mode 100644 index 1c3a72ece8..0000000000 --- a/docker-compose.hsm.prod.yml +++ /dev/null @@ -1,74 +0,0 @@ -version: "3" - -services: - db-migration: - container_name: infisical-db-migration - depends_on: - db: - condition: service_healthy - image: infisical/infisical:latest-postgres - env_file: .env - command: npm run migration:latest - pull_policy: always - networks: - - infisical - - backend: - container_name: infisical-backend - restart: unless-stopped - depends_on: - db: - condition: service_healthy - redis: - condition: service_started - db-migration: - condition: service_completed_successfully - image: infisical/infisical:latest-postgres - pull_policy: always - env_file: .env - ports: - - 80:8080 - environment: - - NODE_ENV=production - volumes: - - /opt/infisical-hsm:/opt/infisical-hsm - networks: - - infisical - - redis: - image: redis - container_name: infisical-dev-redis - env_file: .env - restart: always - environment: - - ALLOW_EMPTY_PASSWORD=yes - ports: - - 6379:6379 - networks: - - infisical - volumes: - - redis_data:/data - - db: - container_name: infisical-db - image: postgres:14-alpine - restart: always - env_file: .env - volumes: - - pg_data:/var/lib/postgresql/data - networks: - - infisical - healthcheck: - test: "pg_isready --username=${POSTGRES_USER} && psql --username=${POSTGRES_USER} --list" - interval: 5s - timeout: 10s - retries: 10 - -volumes: - pg_data: - driver: local - redis_data: - driver: local - -networks: - infisical: