Skip to content

Commit

Permalink
Merge pull request #14 from gipo999/renovate/pin-dependencies
Browse files Browse the repository at this point in the history
chore(deps): pin dependencies
  • Loading branch information
gipo355 authored Jun 3, 2024
2 parents 2c2c005 + 004f93b commit ca8daec
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/actions/docker-setup/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ runs:
using: composite
steps:
- name: Cache Docker images.
uses: ScribeMD/[email protected]
uses: ScribeMD/docker-cache@fb28c93772363301b8d0a6072ce850224b73f74e # 0.5.0
with:
key: docker-${{ runner.os }}-${{ hashFiles('Dockerfile') }}
- name: Set up QEMU
uses: docker/setup-qemu-action@v3
uses: docker/setup-qemu-action@68827325e0b33c7199eb31dd4e31fbe9023e06e3 # v3
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v3
uses: docker/setup-buildx-action@d70bba72b1f3fd22344832f00baa16ece964efeb # v3
4 changes: 2 additions & 2 deletions .github/workflows/gradle-check-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: Setup DOCKER environment
uses: ./.github/actions/docker-setup
- name: Build and export to docker
uses: docker/build-push-action@v5
uses: docker/build-push-action@2cdde995de11925a030ce8070c3d77a52ffcf1c0 # v5
with:
push: false
context: .
Expand All @@ -50,7 +50,7 @@ jobs:
# curl -s http://localhost:8080/tomcat-webapp-boilerplate/app/base/health | grep "UP"
- name: Test docker image endpoint
# Use the retry action
uses: nick-fields/retry@v3
uses: nick-fields/retry@7152eba30c6575329ac0576536151aca5a72780e # v3
with:
max_attempts: 5
retry_on: error
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
# # downloading gradle every time which takes ALOT and allows for caching
# RUN gradle war

FROM tomcat:9-jdk21
FROM tomcat:9-jdk21@sha256:f7c4623aa616f46473003b325246befcc5fe7120b39b07c977dd44057bbdc306

# If not using multistage: docker file expects the war file to be in the build/libs folder.
# if we build it outside we can use github action gradle caching
Expand Down
6 changes: 3 additions & 3 deletions compose.dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ services:
########## postgres
postgresdev:
env_file: ./.env
image: postgres:latest
image: postgres:latest@sha256:1bf73ccae25238fa555100080042f0b2f9be08eb757e200fe6afc1fc413a1b3c
# restart: unless-stopped
# user: postgres
network_mode: host
Expand All @@ -44,7 +44,7 @@ services:
POSTGRES_DB: ${PSQL_DATABASE_NAME}
pgadmin:
container_name: pgadmin4_container
image: dpage/pgadmin4:latest
image: dpage/pgadmin4:latest@sha256:27914eafcac1ab14d1a50cc680f29c9d976c33aed0562f1b741ab9f33b341890
# restart: unless-stopped
network_mode: host
depends_on:
Expand All @@ -59,7 +59,7 @@ services:
########## redis
redisdev:
env_file: ./.env
image: redis/redis-stack:latest
image: redis/redis-stack:latest@sha256:e19025010760acb0b3d07183fd71e8eac47f835878b0afa91e2355766dc94211
# user: redis
# restart: unless-stopped
network_mode: host
Expand Down
2 changes: 1 addition & 1 deletion docker/tomcat.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM tomcat:9-jdk21
FROM tomcat:9-jdk21@sha256:f7c4623aa616f46473003b325246befcc5fe7120b39b07c977dd44057bbdc306

RUN adduser tomcat

Expand Down

0 comments on commit ca8daec

Please sign in to comment.