Skip to content

Commit e5bf76c

Browse files
author
Artem
authored
Merge pull request #2907 from RedisInsight/be/feature/RI-5036/optimize-docker-image
rename envs to match common pattern
2 parents 2488d06 + cfdd193 commit e5bf76c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+264
-293
lines changed

‎.circleci/config.yml‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -618,11 +618,11 @@ jobs:
618618
export RI_CLOUD_CAPI_URL=$RI_CLOUD_CAPI_URL_STAGE
619619
620620
if [ << parameters.env >> == 'stage' ]; then
621-
UPGRADES_LINK=$UPGRADES_LINK_STAGE SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE yarn package:stage --linux << parameters.target >>
621+
RI_UPGRADES_LINK=$RI_UPGRADES_LINK_STAGE RI_SEGMENT_WRITE_KEY=$RI_SEGMENT_WRITE_KEY_STAGE yarn package:stage --linux << parameters.target >>
622622
exit 0;
623623
fi
624624
625-
UPGRADES_LINK='' SEGMENT_WRITE_KEY='' yarn package:stage --linux << parameters.target >>
625+
RI_UPGRADES_LINK='' RI_SEGMENT_WRITE_KEY='' yarn package:stage --linux << parameters.target >>
626626
- when:
627627
condition:
628628
equal: [ true, << parameters.redisstack >> ]
@@ -710,12 +710,12 @@ jobs:
710710
export RI_CLOUD_IDP_GH_ID=$RI_CLOUD_IDP_GH_ID_STAGE
711711
export RI_CLOUD_API_URL=$RI_CLOUD_API_URL_STAGE
712712
export RI_CLOUD_CAPI_URL=$RI_CLOUD_CAPI_URL_STAGE
713-
export UPGRADES_LINK=''
714-
export SEGMENT_WRITE_KEY=''
713+
export RI_UPGRADES_LINK=''
714+
export RI_SEGMENT_WRITE_KEY=''
715715
716716
if [ << parameters.env >> == 'stage' ]; then
717-
export UPGRADES_LINK=$UPGRADES_LINK_STAGE
718-
export SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE
717+
export RI_UPGRADES_LINK=$RI_UPGRADES_LINK_STAGE
718+
export RI_SEGMENT_WRITE_KEY=$RI_SEGMENT_WRITE_KEY_STAGE
719719
fi
720720
721721
# handle manual builds
@@ -792,9 +792,9 @@ jobs:
792792
export RI_CLOUD_CAPI_URL=$RI_CLOUD_CAPI_URL_STAGE
793793
794794
if [ << parameters.env >> == 'stage' ]; then
795-
UPGRADES_LINK=$UPGRADES_LINK_STAGE SEGMENT_WRITE_KEY=$SEGMENT_WRITE_KEY_STAGE yarn package:stage --win << parameters.target >>
795+
RI_UPGRADES_LINK=$RI_UPGRADES_LINK_STAGE RI_SEGMENT_WRITE_KEY=$RI_SEGMENT_WRITE_KEY_STAGE yarn package:stage --win << parameters.target >>
796796
else
797-
UPGRADES_LINK='' SEGMENT_WRITE_KEY='' yarn package:stage --win << parameters.target >>
797+
RI_UPGRADES_LINK='' RI_SEGMENT_WRITE_KEY='' yarn package:stage --win << parameters.target >>
798798
fi
799799
800800
rm -rf release/win-unpacked
@@ -860,20 +860,20 @@ jobs:
860860
- run:
861861
name: Build Docker image (API + UI)
862862
command: |
863-
TELEMETRY=$SEGMENT_WRITE_KEY_DEV
863+
TELEMETRY=$RI_SEGMENT_WRITE_KEY_DEV
864864
865865
if [ << parameters.env >> == 'production' ]; then
866-
TELEMETRY=$SEGMENT_WRITE_KEY
866+
TELEMETRY=$RI_SEGMENT_WRITE_KEY
867867
fi
868868
869869
if [ << parameters.env >> == 'staging' ]; then
870-
TELEMETRY=$SEGMENT_WRITE_KEY_STAGE
870+
TELEMETRY=$RI_SEGMENT_WRITE_KEY_STAGE
871871
fi
872872
873873
docker build --build-arg NODE_ENV=<< parameters.env >> \
874874
--build-arg RI_SERVER_TLS_CERT="$RI_SERVER_TLS_CERT" \
875875
--build-arg RI_SERVER_TLS_KEY="$RI_SERVER_TLS_KEY" \
876-
--build-arg SEGMENT_WRITE_KEY="$TELEMETRY" \
876+
--build-arg RI_SEGMENT_WRITE_KEY="$TELEMETRY" \
877877
-t riv2:latest .
878878
879879
mkdir -p docker-release

‎.circleci/e2e/test.app-image.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ docker-compose -f tests/e2e/rte.docker-compose.yml up --force-recreate -d -V
1717
# run tests
1818
COMMON_URL=$(tail -n 1 apppath)/resources/app.asar/dist/renderer/index.html \
1919
ELECTRON_PATH=$(tail -n 1 apppath)/redisinsight \
20-
SOCKETS_CORS=true \
20+
RI_SOCKETS_CORS=true \
2121
yarn --cwd tests/e2e dotenv -e .desktop.env yarn --cwd tests/e2e test:desktop:ci

‎.circleci/e2e/test.exe.cmd‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set OSS_STANDALONE_HOST=%E2E_CLOUD_DATABASE_HOST%
66
set OSS_STANDALONE_PORT=%E2E_CLOUD_DATABASE_PORT%
77
set OSS_STANDALONE_USERNAME=%E2E_CLOUD_DATABASE_USERNAME%
88
set OSS_STANDALONE_PASSWORD=%E2E_CLOUD_DATABASE_PASSWORD%
9-
set SOCKETS_CORS=true
9+
set RI_SOCKETS_CORS=true
1010

1111
call yarn --cwd tests/e2e install
1212

‎.circleci/redisstack/app-image.repack.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44
ARCH=${ARCH:-x86_64}
55
WORKING_DIRECTORY=$(pwd)
66
SOURCE_APP=${SOURCE_APP:-"RedisInsight-linux-$ARCH.AppImage"}
7-
APP_FOLDER_NAME="RedisInsight-linux"
7+
RI_APP_FOLDER_NAME="RedisInsight-linux"
88
TAR_NAME="RedisInsight-app-linux.$ARCH.tar.gz"
99
TMP_FOLDER="/tmp/RedisInsight-app-$ARCH"
1010

@@ -17,9 +17,9 @@ cp "./release/$SOURCE_APP" "$TMP_FOLDER"
1717
cd "$TMP_FOLDER" || exit 1
1818

1919
./"$SOURCE_APP" --appimage-extract
20-
mv squashfs-root "$APP_FOLDER_NAME"
20+
mv squashfs-root "$RI_APP_FOLDER_NAME"
2121

22-
tar -czvf "$TAR_NAME" "$APP_FOLDER_NAME"
22+
tar -czvf "$TAR_NAME" "$RI_APP_FOLDER_NAME"
2323

2424
cp "$TAR_NAME" "$WORKING_DIRECTORY/release/redisstack/"
2525
cd "$WORKING_DIRECTORY" || exit 1

‎.circleci/redisstack/dmg.repack.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ set -e
44
ARCH=${ARCH:-x64}
55
WORKING_DIRECTORY=$(pwd)
66
TAR_NAME="RedisInsight-app-darwin.$ARCH.tar.gz"
7-
APP_FOLDER_NAME="RedisInsight.app"
8-
TMP_FOLDER="/tmp/$APP_FOLDER_NAME"
7+
RI_APP_FOLDER_NAME="RedisInsight.app"
8+
TMP_FOLDER="/tmp/$RI_APP_FOLDER_NAME"
99

1010
rm -rf "$TMP_FOLDER"
1111

@@ -15,7 +15,7 @@ mkdir -p "$TMP_FOLDER"
1515
hdiutil attach "./release/RedisInsight-mac-$ARCH.dmg"
1616
cp -a /Volumes/RedisInsight*/RedisInsight.app "/tmp"
1717
cd "/tmp" || exit 1
18-
tar -czvf "$TAR_NAME" "$APP_FOLDER_NAME"
18+
tar -czvf "$TAR_NAME" "$RI_APP_FOLDER_NAME"
1919
cp "$TAR_NAME" "$WORKING_DIRECTORY/release/redisstack/"
2020
cd "$WORKING_DIRECTORY" || exit 1
2121
hdiutil unmount /Volumes/RedisInsight*/

‎Dockerfile‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,12 @@ FROM node:18.18-alpine
4343

4444
# runtime args and environment variables
4545
ARG NODE_ENV=production
46-
ARG RI_APP_HOST
47-
ARG RI_APP_PORT=5000
48-
ARG RI_SERVER_TLS_CERT
49-
ARG RI_SERVER_TLS_KEY
50-
ARG SEGMENT_WRITE_KEY
51-
ENV RI_APP_HOST=${RI_APP_HOST}
52-
ENV RI_APP_PORT=${RI_APP_PORT}
53-
ENV RI_SERVER_TLS_CERT=${RI_SERVER_TLS_CERT}
54-
ENV RI_SERVER_TLS_KEY=${RI_SERVER_TLS_KEY}
55-
ENV SEGMENT_WRITE_KEY=${SEGMENT_WRITE_KEY}
46+
ARG RI_SEGMENT_WRITE_KEY
47+
ENV RI_SEGMENT_WRITE_KEY=${RI_SEGMENT_WRITE_KEY}
5648
ENV NODE_ENV=${NODE_ENV}
57-
ENV SERVER_STATIC_CONTENT=true
58-
ENV BUILD_TYPE='DOCKER_ON_PREMISE'
59-
ENV APP_FOLDER_ABSOLUTE_PATH='/data'
49+
ENV RI_SERVE_STATICS=true
50+
ENV RI_BUILD_TYPE='DOCKER_ON_PREMISE'
51+
ENV RI_APP_FOLDER_ABSOLUTE_PATH='/data'
6052

6153
# this resolves CVE-2023-5363
6254
# TODO: remove this line once we update to base image that doesn't have this vulnerability

‎api.Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ RUN dbus-uuidgen > /var/lib/dbus/machine-id
2626

2727
ARG NODE_ENV=production
2828
ENV NODE_ENV=${NODE_ENV}
29-
ENV BUILD_TYPE='DOCKER_ON_PREMISE'
29+
ENV RI_BUILD_TYPE='DOCKER_ON_PREMISE'
3030

3131
WORKDIR /usr/src/app
3232

‎configs/webpack.config.main.prod.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,18 @@ export default merge(baseConfig, {
5555
NODE_ENV: 'production',
5656
DEBUG_PROD: false,
5757
START_MINIMIZED: false,
58-
APP_ENV: 'electron',
58+
RI_APP_TYPE: 'electron',
5959
RI_SERVER_TLS_CERT: process.env.RI_SERVER_TLS_CERT || '',
6060
RI_SERVER_TLS_KEY: process.env.RI_SERVER_TLS_KEY || '',
61-
APP_FOLDER_NAME: process.env.APP_FOLDER_NAME || '',
62-
UPGRADES_LINK: process.env.UPGRADES_LINK || '',
61+
RI_SERVE_STATICS: false,
62+
RI_APP_FOLDER_NAME: process.env.RI_APP_FOLDER_NAME || '',
63+
RI_UPGRADES_LINK: process.env.RI_UPGRADES_LINK || '',
6364
RI_APP_HOST: '127.0.0.1',
64-
BUILD_TYPE: 'ELECTRON',
65-
APP_VERSION: version,
66-
AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
67-
SEGMENT_WRITE_KEY: 'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
68-
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
69-
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
65+
RI_BUILD_TYPE: 'ELECTRON',
66+
RI_APP_VERSION: version,
67+
RI_SEGMENT_WRITE_KEY: 'RI_SEGMENT_WRITE_KEY' in process.env ? process.env.RI_SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
68+
RI_CONNECTIONS_TIMEOUT_DEFAULT: 'RI_CONNECTIONS_TIMEOUT_DEFAULT' in process.env
69+
? process.env.RI_CONNECTIONS_TIMEOUT_DEFAULT
7070
: toString(30 * 1000), // 30 sec
7171
// cloud auth
7272
RI_CLOUD_IDP_AUTHORIZE_URL: 'RI_CLOUD_IDP_AUTHORIZE_URL' in process.env ? process.env.RI_CLOUD_IDP_AUTHORIZE_URL: '',

‎configs/webpack.config.main.stage.ts‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
import webpack from 'webpack';
22
import { merge } from 'webpack-merge';
3-
import { toString } from 'lodash';
43
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
54
import mainProdConfig from './webpack.config.main.prod';
65
import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
7-
import { version } from '../redisinsight/package.json';
86

97
DeleteSourceMaps();
108

@@ -18,21 +16,6 @@ export default merge(mainProdConfig, {
1816

1917
new webpack.EnvironmentPlugin({
2018
NODE_ENV: 'staging',
21-
DEBUG_PROD: false,
22-
START_MINIMIZED: false,
23-
APP_ENV: 'electron',
24-
RI_SERVER_TLS_CERT: process.env.RI_SERVER_TLS_CERT || '',
25-
RI_SERVER_TLS_KEY: process.env.RI_SERVER_TLS_KEY || '',
26-
APP_FOLDER_NAME: process.env.APP_FOLDER_NAME || '',
27-
UPGRADES_LINK: process.env.UPGRADES_LINK || '',
28-
RI_APP_HOST: '127.0.0.1',
29-
BUILD_TYPE: 'ELECTRON',
30-
APP_VERSION: version,
31-
AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
32-
SEGMENT_WRITE_KEY: 'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
33-
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
34-
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
35-
: toString(30 * 1000), // 30 sec
3619
}),
3720
],
3821
});

‎configs/webpack.config.renderer.dev.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -252,20 +252,20 @@ const configuration: webpack.Configuration = {
252252

253253
new webpack.DefinePlugin({
254254
'process.env.NODE_ENV': JSON.stringify('development'),
255-
'process.env.APP_ENV': JSON.stringify('web'),
256-
'process.env.API_PREFIX': JSON.stringify('api'),
257-
'process.env.BASE_API_URL': JSON.stringify('http://localhost'),
258-
'process.env.RESOURCES_BASE_URL': JSON.stringify('http://localhost'),
259-
'process.env.SCAN_COUNT_DEFAULT': JSON.stringify('500'),
260-
'process.env.SCAN_TREE_COUNT_DEFAULT': JSON.stringify('10000'),
261-
'process.env.PIPELINE_COUNT_DEFAULT': JSON.stringify('5'),
262-
'process.env.BUILD_TYPE': JSON.stringify('ELECTRON'),
263-
'process.env.APP_VERSION': JSON.stringify(version),
264-
'process.env.CONNECTIONS_TIMEOUT_DEFAULT': 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
265-
? JSON.stringify(process.env.CONNECTIONS_TIMEOUT_DEFAULT)
255+
'process.env.RI_APP_TYPE': JSON.stringify('web'),
256+
'process.env.RI_API_PREFIX': JSON.stringify('api'),
257+
'process.env.RI_BASE_API_URL': JSON.stringify('http://localhost'),
258+
'process.env.RI_RESOURCES_BASE_URL': JSON.stringify('http://localhost'),
259+
'process.env.RI_SCAN_COUNT_DEFAULT': JSON.stringify('500'),
260+
'process.env.RI_SCAN_TREE_COUNT_DEFAULT': JSON.stringify('10000'),
261+
'process.env.RI_PIPELINE_COUNT_DEFAULT': JSON.stringify('5'),
262+
'process.env.RI_BUILD_TYPE': JSON.stringify('ELECTRON'),
263+
'process.env.RI_APP_VERSION': JSON.stringify(version),
264+
'process.env.RI_CONNECTIONS_TIMEOUT_DEFAULT': 'RI_CONNECTIONS_TIMEOUT_DEFAULT' in process.env
265+
? JSON.stringify(process.env.RI_CONNECTIONS_TIMEOUT_DEFAULT)
266266
: JSON.stringify(30 * 1000),
267-
'process.env.SEGMENT_WRITE_KEY': 'SEGMENT_WRITE_KEY' in process.env
268-
? JSON.stringify(process.env.SEGMENT_WRITE_KEY)
267+
'process.env.RI_SEGMENT_WRITE_KEY': 'RI_SEGMENT_WRITE_KEY' in process.env
268+
? JSON.stringify(process.env.RI_SEGMENT_WRITE_KEY)
269269
: JSON.stringify('SOURCE_WRITE_KEY'),
270270
}),
271271
],

0 commit comments

Comments
 (0)