Skip to content

Commit 5155f0c

Browse files
sattvikcsattvikc
committed
fix: removing writes to config.yaml
1 parent a393f39 commit 5155f0c

File tree

2 files changed

+2
-353
lines changed

2 files changed

+2
-353
lines changed

‎.github/helpers/docker/Dockerfile‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ ADD ./plugin-interface ./plugin-interface
1818
ADD ./plugin ./plugin
1919
ADD ./ee ./ee
2020
ADD ./config.yaml ./config.yaml
21+
RUN echo "host: 0.0.0.0" >> ./config.yaml
22+
RUN echo "postgresql_config_version: 0" >> ./config.yaml
2123
ADD ./version.yaml ./version.yaml
2224

2325
RUN ls && ./jre/bin/java -classpath "./cli/*" io.supertokens.cli.Main true $@

‎.github/helpers/docker/docker-entrypoint.sh‎

Lines changed: 0 additions & 353 deletions
Original file line numberDiff line numberDiff line change
@@ -32,365 +32,12 @@ if [ "${1}" = 'dev' -o "${1}" = "production" -o "${1:0:2}" = "--" ]; then
3232
fi
3333

3434
CONFIG_FILE=/usr/lib/supertokens/config.yaml
35-
TEMP_LOCATION_WHEN_READONLY=/lib/supertokens/temp/
36-
mkdir -p $TEMP_LOCATION_WHEN_READONLY
37-
CONFIG_MD5SUM="$(md5sum /usr/lib/supertokens/config.yaml | awk '{ print $1 }')"
3835

39-
# always assuming read-only
40-
41-
#changing where the config file is written
42-
ORIGINAL_CONFIG=$CONFIG_FILE
43-
CONFIG_FILE="${TEMP_LOCATION_WHEN_READONLY}config.yaml"
44-
cat $ORIGINAL_CONFIG >> $CONFIG_FILE
4536
#required by JNA
4637
export _JAVA_OPTIONS=-Djava.io.tmpdir=$TEMP_LOCATION_WHEN_READONLY
4738
#make sure the CLI knows which config file to pass to the core
4839
set -- "$@" --with-config="$CONFIG_FILE" --with-temp-dir="$TEMP_LOCATION_WHEN_READONLY" --foreground
4940

50-
51-
if [ "$CONFIG_HASH" = "$CONFIG_MD5SUM" ]
52-
then
53-
echo "" >> $CONFIG_FILE
54-
echo "host: 0.0.0.0" >> $CONFIG_FILE
55-
echo "postgresql_config_version: 0" >> $CONFIG_FILE
56-
57-
# verify api keys are passed
58-
if [ ! -z $API_KEYS ]
59-
then
60-
echo "api_keys: $API_KEYS" >> $CONFIG_FILE
61-
fi
62-
63-
# verify postgresql user name is passed
64-
if [ ! -z $POSTGRESQL_USER ]
65-
then
66-
echo "postgresql_user: $POSTGRESQL_USER" >> $CONFIG_FILE
67-
fi
68-
69-
if [ ! -z $POSTGRESQL_PASSWORD_FILE ]
70-
then
71-
POSTGRESQL_PASSWORD=$(cat "$POSTGRESQL_PASSWORD_FILE")
72-
export POSTGRESQL_PASSWORD
73-
fi
74-
75-
# verify postgresql password is passed
76-
if [ ! -z $POSTGRESQL_PASSWORD ]
77-
then
78-
echo "postgresql_password: $POSTGRESQL_PASSWORD" >> $CONFIG_FILE
79-
fi
80-
81-
# check if supertokens port is passed
82-
if [ ! -z $SUPERTOKENS_PORT ]
83-
then
84-
echo "port: $SUPERTOKENS_PORT" >> $CONFIG_FILE
85-
fi
86-
87-
# check if access token validity is passed
88-
if [ ! -z $ACCESS_TOKEN_VALIDITY ]
89-
then
90-
echo "access_token_validity: $ACCESS_TOKEN_VALIDITY" >> $CONFIG_FILE
91-
fi
92-
93-
# check if access token blacklisting is passed
94-
if [ ! -z $ACCESS_TOKEN_BLACKLISTING ]
95-
then
96-
echo "access_token_blacklisting: $ACCESS_TOKEN_BLACKLISTING" >> $CONFIG_FILE
97-
fi
98-
99-
# check if access token signing key dynamic is passed
100-
if [ ! -z $ACCESS_TOKEN_SIGNING_KEY_DYNAMIC ]
101-
then
102-
echo "access_token_signing_key_dynamic: $ACCESS_TOKEN_SIGNING_KEY_DYNAMIC" >> $CONFIG_FILE
103-
fi
104-
105-
# check if access token signing key update interval is passed
106-
if [ ! -z $ACCESS_TOKEN_DYNAMIC_SIGNING_KEY_UPDATE_INTERVAL ]
107-
then
108-
echo "access_token_dynamic_signing_key_update_interval: $ACCESS_TOKEN_DYNAMIC_SIGNING_KEY_UPDATE_INTERVAL" >> $CONFIG_FILE
109-
fi
110-
111-
# check if refresh token validity is passed
112-
if [ ! -z $REFRESH_TOKEN_VALIDITY ]
113-
then
114-
echo "refresh_token_validity: $REFRESH_TOKEN_VALIDITY" >> $CONFIG_FILE
115-
fi
116-
117-
if [ ! -z $PASSWORD_RESET_TOKEN_LIFETIME ]
118-
then
119-
echo "password_reset_token_lifetime: $PASSWORD_RESET_TOKEN_LIFETIME" >> $CONFIG_FILE
120-
fi
121-
122-
if [ ! -z $EMAIL_VERIFICATION_TOKEN_LIFETIME ]
123-
then
124-
echo "email_verification_token_lifetime: $EMAIL_VERIFICATION_TOKEN_LIFETIME" >> $CONFIG_FILE
125-
fi
126-
127-
if [ ! -z $PASSWORDLESS_MAX_CODE_INPUT_ATTEMPTS ]
128-
then
129-
echo "passwordless_max_code_input_attempts: $PASSWORDLESS_MAX_CODE_INPUT_ATTEMPTS" >> $CONFIG_FILE
130-
fi
131-
132-
if [ ! -z $PASSWORDLESS_CODE_LIFETIME ]
133-
then
134-
echo "passwordless_code_lifetime: $PASSWORDLESS_CODE_LIFETIME" >> $CONFIG_FILE
135-
fi
136-
137-
if [ ! -z $BASE_PATH ]
138-
then
139-
echo "base_path: $BASE_PATH" >> $CONFIG_FILE
140-
fi
141-
142-
if [ ! -z $PASSWORD_HASHING_ALG ]
143-
then
144-
echo "password_hashing_alg: $PASSWORD_HASHING_ALG" >> $CONFIG_FILE
145-
fi
146-
147-
if [ ! -z $ARGON2_ITERATIONS ]
148-
then
149-
echo "argon2_iterations: $ARGON2_ITERATIONS" >> $CONFIG_FILE
150-
fi
151-
152-
if [ ! -z $ARGON2_MEMORY_KB ]
153-
then
154-
echo "argon2_memory_kb: $ARGON2_MEMORY_KB" >> $CONFIG_FILE
155-
fi
156-
157-
if [ ! -z $ARGON2_PARALLELISM ]
158-
then
159-
echo "argon2_parallelism: $ARGON2_PARALLELISM" >> $CONFIG_FILE
160-
fi
161-
162-
if [ ! -z $ARGON2_HASHING_POOL_SIZE ]
163-
then
164-
echo "argon2_hashing_pool_size: $ARGON2_HASHING_POOL_SIZE" >> $CONFIG_FILE
165-
fi
166-
167-
if [ ! -z $BCRYPT_LOG_ROUNDS ]
168-
then
169-
echo "bcrypt_log_rounds: $BCRYPT_LOG_ROUNDS" >> $CONFIG_FILE
170-
fi
171-
172-
if [ ! -z $FIREBASE_PASSWORD_HASHING_SIGNER_KEY ]
173-
then
174-
echo "firebase_password_hashing_signer_key: $FIREBASE_PASSWORD_HASHING_SIGNER_KEY" >> $CONFIG_FILE
175-
fi
176-
177-
if [ ! -z $FIREBASE_PASSWORD_HASHING_POOL_SIZE ]
178-
then
179-
echo "firebase_password_hashing_pool_size: $FIREBASE_PASSWORD_HASHING_POOL_SIZE" >> $CONFIG_FILE
180-
fi
181-
182-
if [ ! -z $LOG_LEVEL ]
183-
then
184-
echo "log_level: $LOG_LEVEL" >> $CONFIG_FILE
185-
fi
186-
187-
if [ ! -z $IP_ALLOW_REGEX ]
188-
then
189-
echo "ip_allow_regex: $IP_ALLOW_REGEX" >> $CONFIG_FILE
190-
fi
191-
192-
if [ ! -z $IP_DENY_REGEX ]
193-
then
194-
echo "ip_deny_regex: $IP_DENY_REGEX" >> $CONFIG_FILE
195-
fi
196-
197-
if [ ! -z $TOTP_MAX_ATTEMPTS ]
198-
then
199-
echo "totp_max_attempts: $TOTP_MAX_ATTEMPTS" >> $CONFIG_FILE
200-
fi
201-
202-
if [ ! -z $TOTP_RATE_LIMIT_COOLDOWN_SEC ]
203-
then
204-
echo "totp_rate_limit_cooldown_sec: $TOTP_RATE_LIMIT_COOLDOWN_SEC" >> $CONFIG_FILE
205-
fi
206-
207-
if [ ! -z $SUPERTOKENS_SAAS_SECRET ]
208-
then
209-
echo "supertokens_saas_secret: $SUPERTOKENS_SAAS_SECRET" >> $CONFIG_FILE
210-
fi
211-
212-
if [ ! -z $SUPERTOKENS_MAX_CDI_VERSION ]
213-
then
214-
echo "supertokens_max_cdi_version: $SUPERTOKENS_MAX_CDI_VERSION" >> $CONFIG_FILE
215-
fi
216-
217-
# check if info log path is not passed
218-
if [ ! -z $INFO_LOG_PATH ]
219-
then
220-
if [[ ! -f $INFO_LOG_PATH ]]
221-
then
222-
touch $INFO_LOG_PATH
223-
fi
224-
echo "info_log_path: $INFO_LOG_PATH" >> $CONFIG_FILE
225-
else
226-
echo "info_log_path: null" >> $CONFIG_FILE
227-
fi
228-
229-
# check if error log path is passed
230-
if [ ! -z $ERROR_LOG_PATH ]
231-
then
232-
if [[ ! -f $ERROR_LOG_PATH ]]
233-
then
234-
touch $ERROR_LOG_PATH
235-
fi
236-
echo "error_log_path: $ERROR_LOG_PATH" >> $CONFIG_FILE
237-
else
238-
echo "error_log_path: null" >> $CONFIG_FILE
239-
fi
240-
241-
# check if max server pool size is passed
242-
if [ ! -z $MAX_SERVER_POOL_SIZE ]
243-
then
244-
echo "max_server_pool_size: $MAX_SERVER_POOL_SIZE" >> $CONFIG_FILE
245-
fi
246-
247-
# check if telemetry config is passed
248-
if [ ! -z $DISABLE_TELEMETRY ]
249-
then
250-
echo "disable_telemetry: $DISABLE_TELEMETRY" >> $CONFIG_FILE
251-
fi
252-
253-
# check if max server pool size is passed
254-
if [ ! -z $POSTGRESQL_CONNECTION_POOL_SIZE ]
255-
then
256-
echo "postgresql_connection_pool_size: $POSTGRESQL_CONNECTION_POOL_SIZE" >> $CONFIG_FILE
257-
fi
258-
259-
# check if postgresql host is passed
260-
if [ ! -z $POSTGRESQL_HOST ]
261-
then
262-
echo "postgresql_host: $POSTGRESQL_HOST" >> $CONFIG_FILE
263-
fi
264-
265-
# check if postgresql port is passed
266-
if [ ! -z $POSTGRESQL_PORT ]
267-
then
268-
echo "postgresql_port: $POSTGRESQL_PORT" >> $CONFIG_FILE
269-
fi
270-
271-
# check if postgresql database name is passed
272-
if [ ! -z $POSTGRESQL_DATABASE_NAME ]
273-
then
274-
echo "postgresql_database_name: $POSTGRESQL_DATABASE_NAME" >> $CONFIG_FILE
275-
fi
276-
277-
# check if postgresql table schema is passed
278-
if [ ! -z $POSTGRESQL_TABLE_SCHEMA ]
279-
then
280-
echo "postgresql_table_schema: $POSTGRESQL_TABLE_SCHEMA" >> $CONFIG_FILE
281-
fi
282-
283-
# check if postgresql table name prefix is passed
284-
if [ ! -z $POSTGRESQL_TABLE_NAMES_PREFIX ]
285-
then
286-
echo "postgresql_table_names_prefix: $POSTGRESQL_TABLE_NAMES_PREFIX" >> $CONFIG_FILE
287-
fi
288-
289-
if [ ! -z $POSTGRESQL_CONNECTION_URI ]
290-
then
291-
echo "postgresql_connection_uri: $POSTGRESQL_CONNECTION_URI" >> $CONFIG_FILE
292-
fi
293-
294-
# THE CONFIGS BELOW ARE DEPRECATED----------------
295-
296-
# check if postgresql key value table name is passed
297-
if [ ! -z $POSTGRESQL_KEY_VALUE_TABLE_NAME ]
298-
then
299-
echo "postgresql_key_value_table_name: $POSTGRESQL_KEY_VALUE_TABLE_NAME" >> $CONFIG_FILE
300-
fi
301-
302-
# check if postgresql session info table name is passed
303-
if [ ! -z $POSTGRESQL_SESSION_INFO_TABLE_NAME ]
304-
then
305-
echo "postgresql_session_info_table_name: $POSTGRESQL_SESSION_INFO_TABLE_NAME" >> $CONFIG_FILE
306-
fi
307-
308-
# check if postgresql emailpassword user table name is passed
309-
if [ ! -z $POSTGRESQL_EMAILPASSWORD_USERS_TABLE_NAME ]
310-
then
311-
echo "postgresql_emailpassword_users_table_name: $POSTGRESQL_EMAILPASSWORD_USERS_TABLE_NAME" >> $CONFIG_FILE
312-
fi
313-
314-
# check if postgresql emailpassword password reset table name is passed
315-
if [ ! -z $POSTGRESQL_EMAILPASSWORD_PSWD_RESET_TOKENS_TABLE_NAME ]
316-
then
317-
echo "postgresql_emailpassword_pswd_reset_tokens_table_name: $POSTGRESQL_EMAILPASSWORD_PSWD_RESET_TOKENS_TABLE_NAME" >> $CONFIG_FILE
318-
fi
319-
320-
# check if postgresql email verification tokens table name is passed
321-
if [ ! -z $POSTGRESQL_EMAILVERIFICATION_TOKENS_TABLE_NAME ]
322-
then
323-
echo "postgresql_emailverification_tokens_table_name: $POSTGRESQL_EMAILVERIFICATION_TOKENS_TABLE_NAME" >> $CONFIG_FILE
324-
fi
325-
326-
# check if postgresql verified emails table name is passed
327-
if [ ! -z $POSTGRESQL_EMAILVERIFICATION_VERIFIED_EMAILS_TABLE_NAME ]
328-
then
329-
echo "postgresql_emailverification_verified_emails_table_name: $POSTGRESQL_EMAILVERIFICATION_VERIFIED_EMAILS_TABLE_NAME" >> $CONFIG_FILE
330-
fi
331-
332-
if [ ! -z $POSTGRESQL_THIRDPARTY_USERS_TABLE_NAME ]
333-
then
334-
echo "postgresql_thirdparty_users_table_name: $POSTGRESQL_THIRDPARTY_USERS_TABLE_NAME" >> $CONFIG_FILE
335-
fi
336-
337-
if [ ! -z $POSTGRESQL_IDLE_CONNECTION_TIMEOUT ]
338-
then
339-
echo "postgresql_idle_connection_timeout: $POSTGRESQL_IDLE_CONNECTION_TIMEOUT" >> $CONFIG_FILE
340-
fi
341-
342-
if [ ! -z $POSTGRESQL_MINIMUM_IDLE_CONNECTIONS ]
343-
then
344-
echo "postgresql_minimum_idle_connections: $POSTGRESQL_MINIMUM_IDLE_CONNECTIONS" >> $CONFIG_FILE
345-
fi
346-
347-
if [ ! -z $SUPERTOKENS_SAAS_LOAD_ONLY_CUD ]
348-
then
349-
echo "supertokens_saas_load_only_cud: $SUPERTOKENS_SAAS_LOAD_ONLY_CUD" >> $CONFIG_FILE
350-
fi
351-
352-
if [ ! -z $OAUTH_PROVIDER_PUBLIC_SERVICE_URL ]
353-
then
354-
echo "oauth_provider_public_service_url: $OAUTH_PROVIDER_PUBLIC_SERVICE_URL" >> $CONFIG_FILE
355-
fi
356-
357-
if [ ! -z $OAUTH_PROVIDER_ADMIN_SERVICE_URL ]
358-
then
359-
echo "oauth_provider_admin_service_url: $OAUTH_PROVIDER_ADMIN_SERVICE_URL" >> $CONFIG_FILE
360-
fi
361-
362-
if [ ! -z $OAUTH_PROVIDER_CONSENT_LOGIN_BASE_URL ]
363-
then
364-
echo "oauth_provider_consent_login_base_url: $OAUTH_PROVIDER_CONSENT_LOGIN_BASE_URL" >> $CONFIG_FILE
365-
fi
366-
367-
if [ ! -z $OAUTH_PROVIDER_URL_CONFIGURED_IN_OAUTH_PROVIDER ]
368-
then
369-
echo "oauth_provider_url_configured_in_oauth_provider: $OAUTH_PROVIDER_URL_CONFIGURED_IN_OAUTH_PROVIDER" >> $CONFIG_FILE
370-
fi
371-
372-
if [ ! -z $OAUTH_CLIENT_SECRET_ENCRYPTION_KEY ]
373-
then
374-
echo "oauth_client_secret_encryption_key: $OAUTH_CLIENT_SECRET_ENCRYPTION_KEY" >> $CONFIG_FILE
375-
fi
376-
377-
if [ ! -z $BULK_MIGRATION_PARALLELISM ]
378-
then
379-
echo "bulk_migration_parallelism: $BULK_MIGRATION_PARALLELISM" >> $CONFIG_FILE
380-
fi
381-
382-
if [ ! -z $BULK_MIGRATION_BATCH_SIZE ]
383-
then
384-
echo "bulk_migration_batch_size: $BULK_MIGRATION_BATCH_SIZE" >> $CONFIG_FILE
385-
fi
386-
387-
if [ ! -z $WEBAUTHN_RECOVER_ACCOUNT_TOKEN_LIFETIME ]
388-
then
389-
echo "webauthn_recover_account_token_lifetime: $WEBAUTHN_RECOVER_ACCOUNT_TOKEN_LIFETIME" >> $CONFIG_FILE
390-
fi
391-
392-
fi
393-
39441
# check if no options has been passed to docker run
39542
if [[ "$@" == "supertokens start" ]]
39643
then

0 commit comments

Comments
 (0)