From 6533d731f829d79f41bf2f7209e3a636553792b1 Mon Sep 17 00:00:00 2001 From: Daniel Hougaard Date: Thu, 7 Nov 2024 13:49:04 +0400 Subject: [PATCH] temp: team debugging --- backend/Dockerfile.dev | 44 +++++++---------------------------- backend/src/lib/config/env.ts | 6 ++--- docker-compose.dev.yml | 1 + 3 files changed, 13 insertions(+), 38 deletions(-) diff --git a/backend/Dockerfile.dev b/backend/Dockerfile.dev index 97bc2c6a36..552508e36c 100644 --- a/backend/Dockerfile.dev +++ b/backend/Dockerfile.dev @@ -1,48 +1,22 @@ -FROM node:20-alpine +FROM --platform=linux/amd64 node:20-alpine -# ? Setup a test SoftHSM module. In production a real HSM is used. - -ARG SOFTHSM2_VERSION=2.5.0 - -ENV SOFTHSM2_VERSION=${SOFTHSM2_VERSION} \ - SOFTHSM2_SOURCES=/tmp/softhsm2 +# ? App setup -# install build dependencies including python3 RUN apk --update add \ - alpine-sdk \ - autoconf \ - automake \ - git \ - libtool \ - openssl-dev \ python3 \ make \ - g++ - -# build and install SoftHSM2 -RUN git clone https://github.com/opendnssec/SoftHSMv2.git ${SOFTHSM2_SOURCES} -WORKDIR ${SOFTHSM2_SOURCES} - -RUN git checkout ${SOFTHSM2_VERSION} -b ${SOFTHSM2_VERSION} \ - && sh autogen.sh \ - && ./configure --prefix=/usr/local --disable-gost \ - && make \ - && make install - -WORKDIR /root -RUN rm -fr ${SOFTHSM2_SOURCES} - -# install pkcs11-tool -RUN apk --update add opensc - -RUN softhsm2-util --init-token --slot 0 --label "auth-app" --pin 1234 --so-pin 0000 - -# ? App setup + g++ \ + gcompat \ + libstdc++ RUN apk add --no-cache bash curl && curl -1sLf \ 'https://dl.cloudsmith.io/public/infisical/infisical-cli/setup.alpine.sh' | bash \ && apk add infisical=0.8.1 && apk add --no-cache git + +ENV ChrystokiConfigurationPath=/usr/safenet/lunaclient/ + + WORKDIR /app COPY package.json package.json diff --git a/backend/src/lib/config/env.ts b/backend/src/lib/config/env.ts index cb41ebd726..97f20ae382 100644 --- a/backend/src/lib/config/env.ts +++ b/backend/src/lib/config/env.ts @@ -171,7 +171,7 @@ const envSchema = z .string() .optional() .transform((val) => { - if (process.env.NODE_ENV === "development") return "/usr/local/lib/softhsm/libsofthsm2.so"; + // if (process.env.NODE_ENV === "development") return "/usr/local/lib/softhsm/libsofthsm2.so"; return val; }) ), @@ -180,7 +180,7 @@ const envSchema = z .string() .optional() .transform((val) => { - if (process.env.NODE_ENV === "development") return "1234"; + // if (process.env.NODE_ENV === "development") return "1234"; return val; }) ), @@ -189,7 +189,7 @@ const envSchema = z .string() .optional() .transform((val) => { - if (process.env.NODE_ENV === "development") return "auth-app"; + // if (process.env.NODE_ENV === "development") return "auth-app"; return val; }) ), diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml index 9e56ae5891..fc78f2562a 100644 --- a/docker-compose.dev.yml +++ b/docker-compose.dev.yml @@ -92,6 +92,7 @@ services: - TELEMETRY_ENABLED=false volumes: - ./backend/src:/app/src + - "/etc/luna-docker:/usr/safenet/lunaclient" extra_hosts: - "host.docker.internal:host-gateway"