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.

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

Sofia/use fips latest #2968

Draft
wants to merge 14 commits into
base: conjur-cloud
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM cyberark/ubuntu-ruby-fips:2.0.7-618
FROM cyberark/ubuntu-ruby-fips:2.0.7-697

ENV DEBIAN_FRONTEND=noninteractive \
PORT=80 \
Expand Down
6 changes: 3 additions & 3 deletions ci/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3"
services:
pg:
image: postgres:10.16
image: postgres:15
environment:
# To avoid the following error:
#
Expand All @@ -15,13 +15,13 @@ services:
POSTGRES_HOST_AUTH_METHOD: trust

audit:
image: postgres:10.16
image: postgres:15
environment:
# See description on `pg` service for use of POSTGRES_HOST_AUTH_METHOD
POSTGRES_HOST_AUTH_METHOD: trust

testdb:
image: postgres:10.16
image: postgres:15
environment:
# To avoid the following error:
#
Expand Down
6 changes: 3 additions & 3 deletions dev/docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
version: "3"
services:
pg:
image: postgres:10.16
image: postgres:15
environment:
# To avoid the following error:
#
Expand All @@ -20,13 +20,13 @@ services:


audit:
image: postgres:10.16
image: postgres:15
environment:
# See description on `pg` service for use of POSTGRES_HOST_AUTH_METHOD
POSTGRES_HOST_AUTH_METHOD: trust

testdb:
image: postgres:10.16
image: postgres:15
environment:
POSTGRES_PASSWORD: postgres_secret

Expand Down