Skip to content

Commit 53f6ab1

Browse files
maidul98maidul98
authored
Merge pull request #3178 from akhilmhdh/feat/connector
Add QUIC to gateway
2 parents f376eaa + 0f5a1b1 commit 53f6ab1

File tree

14 files changed

+846
-312
lines changed

14 files changed

+846
-312
lines changed

‎Dockerfile.standalone-infisical

+33-34
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,10 @@ ARG POSTHOG_API_KEY=posthog-api-key
33
ARG INTERCOM_ID=intercom-id
44
ARG CAPTCHA_SITE_KEY=captcha-site-key
55

6-
FROM node:20-alpine AS base
6+
FROM node:20-slim AS base
77

88
FROM base AS frontend-dependencies
99

10-
# Check https://github.com/nodejs/docker-node/tree/b4117f9333da4138b03a546ec926ef50a31506c3#nodealpine to understand why libc6-compat might be needed.
11-
RUN apk add --no-cache libc6-compat
12-
1310
WORKDIR /app
1411

1512
COPY frontend/package.json frontend/package-lock.json ./
@@ -45,8 +42,8 @@ RUN npm run build
4542
FROM base AS frontend-runner
4643
WORKDIR /app
4744

48-
RUN addgroup --system --gid 1001 nodejs
49-
RUN adduser --system --uid 1001 non-root-user
45+
RUN groupadd --system --gid 1001 nodejs
46+
RUN useradd --system --uid 1001 --gid nodejs non-root-user
5047

5148
COPY --from=frontend-builder --chown=non-root-user:nodejs /app/dist ./
5249

@@ -56,21 +53,23 @@ USER non-root-user
5653
## BACKEND
5754
##
5855
FROM base AS backend-build
59-
RUN addgroup --system --gid 1001 nodejs \
60-
&& adduser --system --uid 1001 non-root-user
6156

6257
WORKDIR /app
6358

6459
# Install all required dependencies for build
65-
RUN apk --update add \
60+
RUN apt-get update && apt-get install -y \
6661
python3 \
6762
make \
6863
g++ \
6964
unixodbc \
70-
freetds \
65+
freetds-bin \
7166
unixodbc-dev \
7267
libc-dev \
73-
freetds-dev
68+
freetds-dev \
69+
&& rm -rf /var/lib/apt/lists/*
70+
71+
RUN groupadd --system --gid 1001 nodejs
72+
RUN useradd --system --uid 1001 --gid nodejs non-root-user
7473

7574
COPY backend/package*.json ./
7675
RUN npm ci --only-production
@@ -86,18 +85,19 @@ FROM base AS backend-runner
8685
WORKDIR /app
8786

8887
# Install all required dependencies for runtime
89-
RUN apk --update add \
88+
RUN apt-get update && apt-get install -y \
9089
python3 \
9190
make \
9291
g++ \
9392
unixodbc \
94-
freetds \
93+
freetds-bin \
9594
unixodbc-dev \
9695
libc-dev \
97-
freetds-dev
96+
freetds-dev \
97+
&& rm -rf /var/lib/apt/lists/*
9898

9999
# Configure ODBC
100-
RUN printf "[FreeTDS]\nDescription = FreeTDS Driver\nDriver = /usr/lib/libtdsodbc.so\nSetup = /usr/lib/libtdsodbc.so\nFileUsage = 1\n" > /etc/odbcinst.ini
100+
RUN printf "[FreeTDS]\nDescription = FreeTDS Driver\nDriver = /usr/lib/x86_64-linux-gnu/odbc/libtdsodbc.so\nSetup = /usr/lib/x86_64-linux-gnu/odbc/libtdsS.so\nFileUsage = 1\n" > /etc/odbcinst.ini
101101

102102
COPY backend/package*.json ./
103103
RUN npm ci --only-production
@@ -109,34 +109,35 @@ RUN mkdir frontend-build
109109
# Production stage
110110
FROM base AS production
111111

112-
RUN apk add --upgrade --no-cache ca-certificates
113-
RUN apk add --no-cache bash curl && curl -1sLf \
114-
'https://dl.cloudsmith.io/public/infisical/infisical-cli/setup.alpine.sh' | bash \
115-
&& apk add infisical=0.31.1 && apk add --no-cache git
116-
117-
WORKDIR /
118-
119-
# Install all required runtime dependencies
120-
RUN apk --update add \
112+
RUN apt-get update && apt-get install -y \
113+
ca-certificates \
114+
bash \
115+
curl \
116+
git \
121117
python3 \
122118
make \
123119
g++ \
124120
unixodbc \
125-
freetds \
121+
freetds-bin \
126122
unixodbc-dev \
127123
libc-dev \
128124
freetds-dev \
129-
bash \
130-
curl \
131-
git \
132-
openssh
125+
openssh-client \
126+
&& rm -rf /var/lib/apt/lists/*
127+
128+
# Install Infisical CLI
129+
RUN curl -1sLf 'https://dl.cloudsmith.io/public/infisical/infisical-cli/setup.deb.sh' | bash \
130+
&& apt-get update && apt-get install -y infisical=0.31.1 \
131+
&& rm -rf /var/lib/apt/lists/*
132+
133+
WORKDIR /
133134

134135
# Configure ODBC in production
135-
RUN printf "[FreeTDS]\nDescription = FreeTDS Driver\nDriver = /usr/lib/libtdsodbc.so\nSetup = /usr/lib/libtdsodbc.so\nFileUsage = 1\n" > /etc/odbcinst.ini
136+
RUN printf "[FreeTDS]\nDescription = FreeTDS Driver\nDriver = /usr/lib/x86_64-linux-gnu/odbc/libtdsodbc.so\nSetup = /usr/lib/x86_64-linux-gnu/odbc/libtdsS.so\nFileUsage = 1\n" > /etc/odbcinst.ini
136137

137138
# Setup user permissions
138-
RUN addgroup --system --gid 1001 nodejs \
139-
&& adduser --system --uid 1001 non-root-user
139+
RUN groupadd --system --gid 1001 nodejs \
140+
&& useradd --system --uid 1001 --gid nodejs non-root-user
140141

141142
# Give non-root-user permission to update SSL certs
142143
RUN chown -R non-root-user /etc/ssl/certs
@@ -154,9 +155,7 @@ ENV INTERCOM_ID=$INTERCOM_ID
154155
ARG CAPTCHA_SITE_KEY
155156
ENV CAPTCHA_SITE_KEY=$CAPTCHA_SITE_KEY
156157

157-
158158
COPY --from=backend-runner /app /backend
159-
160159
COPY --from=frontend-runner /app ./backend/frontend-build
161160

162161
ARG INFISICAL_PLATFORM_VERSION

‎backend/Dockerfile.dev

+31-29
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM node:20-alpine
1+
FROM node:20-slim
22

33
# ? Setup a test SoftHSM module. In production a real HSM is used.
44

@@ -7,32 +7,32 @@ ARG SOFTHSM2_VERSION=2.5.0
77
ENV SOFTHSM2_VERSION=${SOFTHSM2_VERSION} \
88
SOFTHSM2_SOURCES=/tmp/softhsm2
99

10-
# install build dependencies including python3 (required for pkcs11js and partially TDS driver)
11-
RUN apk --update add \
12-
alpine-sdk \
13-
autoconf \
14-
automake \
15-
git \
16-
libtool \
17-
openssl-dev \
18-
python3 \
19-
make \
20-
g++ \
21-
openssh
22-
23-
# install dependencies for TDS driver (required for SAP ASE dynamic secrets)
24-
RUN apk add --no-cache \
10+
# Install build dependencies including python3 (required for pkcs11js and partially TDS driver)
11+
RUN apt-get update && apt-get install -y \
12+
build-essential \
13+
autoconf \
14+
automake \
15+
git \
16+
libtool \
17+
libssl-dev \
18+
python3 \
19+
make \
20+
g++ \
21+
openssh-client \
22+
curl \
23+
pkg-config
24+
25+
# Install dependencies for TDS driver (required for SAP ASE dynamic secrets)
26+
RUN apt-get install -y \
2527
unixodbc \
26-
freetds \
2728
unixodbc-dev \
28-
libc-dev \
29-
freetds-dev
29+
freetds-dev \
30+
freetds-bin \
31+
tdsodbc
3032

33+
RUN printf "[FreeTDS]\nDescription = FreeTDS Driver\nDriver = /usr/lib/x86_64-linux-gnu/odbc/libtdsodbc.so\nSetup = /usr/lib/x86_64-linux-gnu/odbc/libtdsodbc.so\nFileUsage = 1\n" > /etc/odbcinst.ini
3134

32-
RUN printf "[FreeTDS]\nDescription = FreeTDS Driver\nDriver = /usr/lib/libtdsodbc.so\nSetup = /usr/lib/libtdsodbc.so\nFileUsage = 1\n" > /etc/odbcinst.ini
33-
34-
# build and install SoftHSM2
35-
35+
# Build and install SoftHSM2
3636
RUN git clone https://github.com/opendnssec/SoftHSMv2.git ${SOFTHSM2_SOURCES}
3737
WORKDIR ${SOFTHSM2_SOURCES}
3838

@@ -45,16 +45,18 @@ RUN git checkout ${SOFTHSM2_VERSION} -b ${SOFTHSM2_VERSION} \
4545
WORKDIR /root
4646
RUN rm -fr ${SOFTHSM2_SOURCES}
4747

48-
# install pkcs11-tool
49-
RUN apk --update add opensc
48+
# Install pkcs11-tool
49+
RUN apt-get install -y opensc
5050

51-
RUN softhsm2-util --init-token --slot 0 --label "auth-app" --pin 1234 --so-pin 0000
51+
RUN mkdir -p /etc/softhsm2/tokens && \
52+
softhsm2-util --init-token --slot 0 --label "auth-app" --pin 1234 --so-pin 0000
5253

5354
# ? App setup
5455

55-
RUN apk add --no-cache bash curl && curl -1sLf \
56-
'https://dl.cloudsmith.io/public/infisical/infisical-cli/setup.alpine.sh' | bash \
57-
&& apk add infisical=0.8.1 && apk add --no-cache git
56+
# Install Infisical CLI
57+
RUN curl -1sLf 'https://dl.cloudsmith.io/public/infisical/infisical-cli/setup.deb.sh' | bash && \
58+
apt-get update && \
59+
apt-get install -y infisical=0.8.1
5860

5961
WORKDIR /app
6062

0 commit comments

Comments
 (0)