Skip to content

E2e/feature/ri 5036/optimize docker image #2921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 8, 2024
Merged

E2e/feature/ri 5036/optimize docker image #2921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14e5c90
run e2e with tls
Jan 7, 2024
4c444e3
pass envs to docker-compose
Jan 7, 2024
59151f7
pass envs to docker-compose for local builds also
Jan 7, 2024
89569fe
fix env name
Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,8 @@ jobs:
command: |
cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/web/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
TEST_BIG_DB_DUMP=$TEST_BIG_DB_DUMP \
RI_SERVER_TLS_CERT="$RI_SERVER_TLS_CERT" \
RI_SERVER_TLS_KEY="$RI_SERVER_TLS_KEY" \
docker-compose \
-f tests/e2e/rte.docker-compose.yml \
-f tests/e2e/docker.web.docker-compose.yml \
Expand All @@ -476,6 +478,8 @@ jobs:
command: |
cd tests/e2e && export TEST_FILES=$(circleci tests glob "tests/web/**/*.e2e.ts" | circleci tests split --split-by=timings) && cd ../..
TEST_BIG_DB_DUMP=$TEST_BIG_DB_DUMP \
RI_SERVER_TLS_CERT="$RI_SERVER_TLS_CERT" \
RI_SERVER_TLS_KEY="$RI_SERVER_TLS_KEY" \
docker-compose \
-f tests/e2e/rte.docker-compose.yml \
-f tests/e2e/local.web.docker-compose.yml \
Expand Down Expand Up @@ -871,8 +875,6 @@ jobs:
fi

docker build --build-arg NODE_ENV=<< parameters.env >> \
--build-arg RI_SERVER_TLS_CERT="$RI_SERVER_TLS_CERT" \
--build-arg RI_SERVER_TLS_KEY="$RI_SERVER_TLS_KEY" \
--build-arg RI_SEGMENT_WRITE_KEY="$TELEMETRY" \
-t riv2:latest .

Expand Down
3 changes: 3 additions & 0 deletions tests/e2e/docker.web.docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,9 @@ services:
image: riv2:latest
env_file:
- ./.env
environment:
RI_SERVER_TLS_CERT: $RI_SERVER_TLS_CERT
RI_SERVER_TLS_KEY: $RI_SERVER_TLS_KEY
volumes:
- rihomedir:/data
- tmp:/tmp
Expand Down
3 changes: 3 additions & 0 deletions tests/e2e/local.web.docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ services:
build:
context: ./../../
dockerfile: Dockerfile
environment:
RI_SERVER_TLS_CERT: $RI_SERVER_TLS_CERT
RI_SERVER_TLS_KEY: $RI_SERVER_TLS_KEY
volumes:
- .redisinsight-app:/root/.redisinsight-app
- ./test-data/certs:/root/certs
Expand Down