diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index b5c210201..42651e8c0 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -32,10 +32,10 @@ services: networks: - sapl-net sapl: -# image: interlegis/sapl:3.1.162-RC13 - build: - context: ../ - dockerfile: ./docker/Dockerfile + image: interlegis/sapl:3.1.163-RC2 +# build: +# context: ../ +# dockerfile: ./docker/Dockerfile container_name: sapl labels: NAME: "sapl" @@ -74,4 +74,4 @@ volumes: sapl_data: sapl_media: solr_data: - solr_configsets: \ No newline at end of file + solr_configsets: diff --git a/release.sh b/release.sh index ad2f96e2a..80051e9d1 100755 --- a/release.sh +++ b/release.sh @@ -30,11 +30,11 @@ FINAL_VERSION= function change_files { - OLD_VERSION=$(grep -E 'interlegis/sapl:'$VERSION_PATTERN dist/docker-compose.yml | cut -d':' -f3) + OLD_VERSION=$(grep -E 'interlegis/sapl:'$VERSION_PATTERN docker/docker-compose.yaml | cut -d':' -f3) echo "Atualizando de "$OLD_VERSION" para "$FINAL_VERSION - sed -E -i "" "s|$OLD_VERSION|$FINAL_VERSION|g" dist/docker-compose.yml + sed -E -i "" "s|$OLD_VERSION|$FINAL_VERSION|g" docker/docker-compose.yaml sed -E -i "" "s|$OLD_VERSION|$FINAL_VERSION|g" setup.py @@ -61,11 +61,14 @@ function set_rc_version { fi FINAL_VERSION=$NEXT_RC_VERSION + + echo "OLD_VERSION: $OLD_VERSION" + echo "FINAL_VERSION: $FINAL_VERSION" } function commit_and_push { echo "committing..." - git add dist/docker-compose.yml setup.py sapl/settings.py sapl/templates/base.html + git add docker/docker-compose.yaml setup.py sapl/settings.py sapl/templates/base.html git commit -m "Release: $FINAL_VERSION" git tag $FINAL_VERSION