Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/gradle/develop/com.datadoghq-d…
Browse files Browse the repository at this point in the history
…atadog-api-client-2.30.0
  • Loading branch information
brostk authored Nov 12, 2024
2 parents c45cdb6 + ff6d106 commit df4c529
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion db-init/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM flyway/flyway:10.19-alpine
RUN <<EOR
apk update
apk upgrade
apk --no-cache add libcrypto3 libssl3 openssl postgresql-client py3-pip
apk --no-cache add libcrypto3 postgresql-client py3-pip
rm -rf /var/cache/apk/*
pip3 install --no-cache-dir sqlfluff==2.1.2
pip3 install --no-cache-dir jinja2==3.1.4
Expand Down
4 changes: 2 additions & 2 deletions rabbitmq/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ USER root
# Upgrade libssl3 and openssl to the specific version
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
libssl3=3.0.14-1~deb12u2 \
openssl=3.0.14-1~deb12u2 \
libssl3=3.0.15-1~deb12u1 \
openssl=3.0.15-1~deb12u1 \
&& rm -rf /var/lib/apt/lists/*

# Change ownership and permissions of configuration files
Expand Down
2 changes: 1 addition & 1 deletion svc-bgs-api/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ FROM ruby:3.3.6-alpine3.19
# https://www.cloudbees.com/blog/build-minimal-docker-container-ruby-apps

# hadolint ignore=DL3018
RUN apk update && apk upgrade && apk --no-cache add git ruby-dev=3.2.4-r0 curl-dev build-base=0.5-r3 openssl && rm -rf /var/cache/apk/*
RUN apk update && apk upgrade && apk --no-cache add git ruby-dev=3.2.6-r0 curl-dev build-base=0.5-r3 openssl && rm -rf /var/cache/apk/*

WORKDIR /app

Expand Down

0 comments on commit df4c529

Please sign in to comment.