Skip to content
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

Jump to bottom

Bump image versions fix python-searchable demo #74

Merged
merged 1 commit into from
Sep 11, 2024
Merged

Bump image versions fix python-searchable demo #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions django-transparent/docker-compose.django-transparent.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
# - ./.acrakeys/acra-server/${ACRA_CLIENT_ID}_storage.pub
# - ./.acrakeys/acra-server/${ACRA_CLIENT_ID}_storage_sym
acra-keymaker_client:
image: "cossacklabs/acra-keymaker:${ACRA_DOCKER_IMAGE_TAG:-0.93.0}"
image: "cossacklabs/acra-keymaker:${ACRA_DOCKER_IMAGE_TAG:-0.95.0}"
network_mode: "none"
environment:
ACRA_MASTER_KEY: ${ACRA_SERVER_MASTER_KEY:-N0MyZEVCRGY1cHA4ODRSVHp3c3BNeGtDekxaV3BhTHI=}
Expand Down Expand Up @@ -57,7 +57,7 @@ services:


acra-server:
image: "cossacklabs/acra-server:${ACRA_DOCKER_IMAGE_TAG:-0.93.0}"
image: "cossacklabs/acra-server:${ACRA_DOCKER_IMAGE_TAG:-0.95.0}"
# Restart server after correct termination, for example after the config
# was changed through the API
restart: always
Expand Down
4 changes: 2 additions & 2 deletions django/docker-compose.django.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
# - ./.acrakeys/acra-server/${ACRA_CLIENT_ID}_storage
# - ./.acrakeys/acra-writer/${ACRA_CLIENT_ID}_storage.pub
acra-keymaker_writer:
image: "cossacklabs/acra-keymaker:${ACRA_DOCKER_IMAGE_TAG:-0.93.0}"
image: "cossacklabs/acra-keymaker:${ACRA_DOCKER_IMAGE_TAG:-0.95.0}"
network_mode: "none"
environment:
ACRA_MASTER_KEY: ${ACRA_SERVER_MASTER_KEY:-N0MyZEVCRGY1cHA4ODRSVHp3c3BNeGtDekxaV3BhTHI=}
Expand Down Expand Up @@ -57,7 +57,7 @@ services:


acra-server:
image: "cossacklabs/acra-server:${ACRA_DOCKER_IMAGE_TAG:-0.93.0}"
image: "cossacklabs/acra-server:${ACRA_DOCKER_IMAGE_TAG:-0.95.0}"
# Restart server after correct termination, for example after the config
# was changed through the API
restart: always
Expand Down
2 changes: 1 addition & 1 deletion python-searchable/acra-server-config/acra-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: 0.93.0
version: 0.95.0

encryptor_config_file: "/config/searchable.yaml"

Expand Down
4 changes: 2 additions & 2 deletions python-searchable/docker-compose.python-searchable.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ services:
# - ./.acrakeys/acra-server/${ACRA_CLIENT_ID}_storage
# - ./.acrakeys/acra-writer/${ACRA_CLIENT_ID}_storage.pub
acra-keymaker_client:
image: "cossacklabs/acra-keymaker:${ACRA_DOCKER_IMAGE_TAG:-0.93.0}"
image: "cossacklabs/acra-keymaker:${ACRA_DOCKER_IMAGE_TAG:-0.95.0}"
network_mode: "none"
environment:
ACRA_MASTER_KEY: ${ACRA_SERVER_MASTER_KEY:-N0MyZEVCRGY1cHA4ODRSVHp3c3BNeGtDekxaV3BhTHI=}
Expand Down Expand Up @@ -53,7 +53,7 @@ services:
- webui-mysql

acra-server:
image: "cossacklabs/acra-server:${ACRA_DOCKER_IMAGE_TAG:-0.93.0}"
image: "cossacklabs/acra-server:${ACRA_DOCKER_IMAGE_TAG:-0.95.0}"
# Restart server after correct termination, for example after the config
# was changed through the API
restart: always
Expand Down
2 changes: 1 addition & 1 deletion rails/.acraconfigs/acra-server/acra-server.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
version: 0.93.0
version: 0.95.0
encryptor_config_file: /config/encryptor.yaml
4 changes: 2 additions & 2 deletions rails/docker-compose.rails.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
# - ./.acrakeys/acra-server/${ACRA_CLIENT_ID}_storage
# - ./.acrakeys/acra-writer/${ACRA_CLIENT_ID}_storage.pub
acra-keymaker_writer:
image: "cossacklabs/acra-keymaker:${ACRA_DOCKER_IMAGE_TAG:-0.93.0}"
image: "cossacklabs/acra-keymaker:${ACRA_DOCKER_IMAGE_TAG:-0.95.0}"
network_mode: "none"
environment:
ACRA_MASTER_KEY: ${ACRA_SERVER_MASTER_KEY:-N0MyZEVCRGY1cHA4ODRSVHp3c3BNeGtDekxaV3BhTHI=}
Expand Down Expand Up @@ -53,7 +53,7 @@ services:


acra-server:
image: "cossacklabs/acra-server:${ACRA_DOCKER_IMAGE_TAG:-0.93.0}"
image: "cossacklabs/acra-server:${ACRA_DOCKER_IMAGE_TAG:-0.95.0}"
# Restart server after correct termination, for example after the config
# was changed through the API
restart: always
Expand Down
10 changes: 7 additions & 3 deletions run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,14 +618,18 @@ acraengdemo_launch_project_timescaledb() {

acraengdemo_launch_project_python-searchable() {
COSSACKLABS_ACRA_VCS_URL=${COSSACKLABS_ACRA_VCS_URL:-'https://github.com/cossacklabs/acra'}
COSSACKLABS_ACRA_VCS_BRANCH=${COSSACKLABS_ACRA_VCS_BRANCH:-0.93.0}
# using commit instead of version/tag to use the commit with specific SqlAlchemy from examples/python
# https://github.com/cossacklabs/acra/pull/669/commits/be2ab1a4440e105dee1423ae21da1ee74e842801
# and some examples/python fixes
# https://github.com/cossacklabs/acra/commit/e1773020a881a39d126724bd3992b9b436173fa0
COSSACKLABS_ACRA_VCS_REF=${COSSACKLABS_ACRA_VCS_REF:-'e1773020a881a39d126724bd3992b9b436173fa0'}
if [ -d "${PROJECT_DIR}/acra" ]
then
git -C "${PROJECT_DIR}/acra" checkout "$COSSACKLABS_ACRA_VCS_BRANCH";
git -C "${PROJECT_DIR}/acra" checkout "$COSSACKLABS_ACRA_VCS_REF";
Comment on lines +621 to +628
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If I understand correctly, this commit is pinned because it was done after the 0.95.0 and we don't have a tag to refer to it, right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Exactly! Moreover there are no tag-based branches like 0.95.0 its only tags, so we should using come commits

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok, thanks! Could you then add a tag TODO or something to mark this as a temporal workaround?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0.95.0

actually we have release/0.96.0 )) we forgot some releases to create separate branches, but in general have)

else
# we should clone into folder with acra-eng-demo to allow mount files from acra/examples/python folder
acraengdemo_cmd \
"git clone --depth 1 -b $COSSACKLABS_ACRA_VCS_BRANCH $COSSACKLABS_ACRA_VCS_URL ${PROJECT_DIR}/acra" \
"git clone $COSSACKLABS_ACRA_VCS_URL ${PROJECT_DIR}/acra && cd ${PROJECT_DIR}/acra && git checkout $COSSACKLABS_ACRA_VCS_REF" \
"Cloning Acra"
fi;
COSSACKLABS_ACRA_VCS_REF=$(git -C "${PROJECT_DIR}/acra" rev-parse --verify HEAD)
Expand Down
4 changes: 2 additions & 2 deletions timescaledb/docker-compose.timescaledb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ services:
# - ./.acrakeys/acra-server/${ACRA_CLIENT_ID}_storage.pub
# - ./.acrakeys/acra-server/${ACRA_CLIENT_ID}_storage_sym
acra-keymaker_client:
image: "cossacklabs/acra-keymaker:${ACRA_DOCKER_IMAGE_TAG:-0.93.0}"
image: "cossacklabs/acra-keymaker:${ACRA_DOCKER_IMAGE_TAG:-0.95.0}"
network_mode: "none"
environment:
ACRA_MASTER_KEY: ${ACRA_SERVER_MASTER_KEY:-N0MyZEVCRGY1cHA4ODRSVHp3c3BNeGtDekxaV3BhTHI=}
Expand Down Expand Up @@ -51,7 +51,7 @@ services:
world:

acra-server:
image: "cossacklabs/acra-server:${ACRA_DOCKER_IMAGE_TAG:-0.93.0}"
image: "cossacklabs/acra-server:${ACRA_DOCKER_IMAGE_TAG:-0.95.0}"
# Restart server after correct termination, for example after the config
# was changed through the API
restart: always
Expand Down