From 79133598f357d2d615f839b5f9d564bfc450897e Mon Sep 17 00:00:00 2001 From: Chengjie Yin <89034346+chengjie8@users.noreply.github.com> Date: Mon, 6 May 2024 12:39:01 -0400 Subject: [PATCH 1/4] upgrade spring-security --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index c9b4951059..17dcfe8255 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ h2_version=2.2.224 hibernate_types_version=3.7.3 postgresql_version=42.7.2 -spring_security_version=6.0.3 +spring_security_version=6.1.9 spring_boot_version=3.2.3 spring_doc_version=2.2.0 swagger_version=2.2.16 From 48d6008f1c7fa02e2314331e82e183fad9b1709a Mon Sep 17 00:00:00 2001 From: Chengjie Yin <89034346+chengjie8@users.noreply.github.com> Date: Mon, 6 May 2024 14:53:31 -0400 Subject: [PATCH 2/4] update rdoc --- svc-bgs-api/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/svc-bgs-api/Dockerfile b/svc-bgs-api/Dockerfile index 0ba78eb9b5..53dfe197cb 100644 --- a/svc-bgs-api/Dockerfile +++ b/svc-bgs-api/Dockerfile @@ -16,9 +16,9 @@ COPY Gemfile Gemfile.lock ./ # After install, delete packages only needed during bundler install & clean APK cache RUN gem install bundler:2.5.4 --no-document && bundle install \ && gem update cgi \ + && gem update rdoc --version 6.6.3.1 \ && apk del git ruby-dev curl-dev build-base \ && rm -rf /var/cache/apk/* - # https://stackoverflow.com/a/46801962 # Copy script that runs docker-entrypoint.sh if it exists COPY set-env-secrets.src entrypoint-wrapper.sh docker-entry*.sh ./ From 0e63057034c524faf0b397de032afac058ca064f Mon Sep 17 00:00:00 2001 From: Chengjie Yin <89034346+chengjie8@users.noreply.github.com> Date: Mon, 6 May 2024 16:22:09 -0400 Subject: [PATCH 3/4] bug fix --- svc-bgs-api/Dockerfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/svc-bgs-api/Dockerfile b/svc-bgs-api/Dockerfile index 53dfe197cb..2c60206150 100644 --- a/svc-bgs-api/Dockerfile +++ b/svc-bgs-api/Dockerfile @@ -14,11 +14,14 @@ WORKDIR /app COPY Gemfile Gemfile.lock ./ # After install, delete packages only needed during bundler install & clean APK cache -RUN gem install bundler:2.5.4 --no-document && bundle install \ - && gem update cgi \ - && gem update rdoc --version 6.6.3.1 \ - && apk del git ruby-dev curl-dev build-base \ - && rm -rf /var/cache/apk/* +RUN gem install bundler:2.5.4 --no-document && \ + bundle install && \ + gem update cgi && \ + gem install rdoc -v 6.6.3.1 && \ + apk del git ruby-dev curl-dev build-base && \ + rm -rf /var/cache/apk/* + + # https://stackoverflow.com/a/46801962 # Copy script that runs docker-entrypoint.sh if it exists COPY set-env-secrets.src entrypoint-wrapper.sh docker-entry*.sh ./ From 9251d546119edb2ee5a16d4a9389b2d201ffbb5f Mon Sep 17 00:00:00 2001 From: Chengjie Yin <89034346+chengjie8@users.noreply.github.com> Date: Mon, 6 May 2024 22:13:36 -0400 Subject: [PATCH 4/4] minor change --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 17dcfe8255..97d3617bec 100644 --- a/gradle.properties +++ b/gradle.properties @@ -15,7 +15,7 @@ h2_version=2.2.224 hibernate_types_version=3.7.3 postgresql_version=42.7.2 -spring_security_version=6.1.9 +spring_security_version=6.1.8 spring_boot_version=3.2.3 spring_doc_version=2.2.0 swagger_version=2.2.16