Skip to content

Commit

Permalink
Merge branch 'renovate/jenkins-jenkins-2.x' of https://github.com/yur…
Browse files Browse the repository at this point in the history
…ake/k8s-3tier-webapp into renovate/jenkins-jenkins-2.x
  • Loading branch information
yurake committed Mar 17, 2023
2 parents 1a158eb + e0e06cd commit b4799b9
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-image-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: docker/setup-buildx-action@v2

- name: Cache Docker layers
uses: actions/cache@v3.2.6
uses: actions/cache@v3.3.1
with:
path: /tmp/.buildx-cache
key: ${{ github.ref }}-${{ github.sha }}
Expand Down
20 changes: 10 additions & 10 deletions .github/workflows/java-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,13 @@ jobs:
languages: java

- name: Cache SonarCloud packages
uses: actions/cache@v3.2.6
uses: actions/cache@v3.3.1
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar-parent-pom
restore-keys: ${{ runner.os }}-sonar-parent-pom
- name: Cache local Maven repository
uses: actions/cache@v3.2.6
uses: actions/cache@v3.3.1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-parent-pom-${{ hashFiles('**/parent-pom/pom.xml') }}
Expand All @@ -56,13 +56,13 @@ jobs:
run: ./mvnw -B deploy --settings ../.m2/settings.xml

- name: Cache SonarCloud packages
uses: actions/cache@v3.2.6
uses: actions/cache@v3.3.1
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar-webapp-service
restore-keys: ${{ runner.os }}-sonar-webapp-service
- name: Cache local Maven repository
uses: actions/cache@v3.2.6
uses: actions/cache@v3.3.1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-webapp-service-${{ hashFiles('**/webapp-service/pom.xml') }}
Expand Down Expand Up @@ -151,7 +151,7 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Cache Docker layers
uses: actions/cache@v3.2.6
uses: actions/cache@v3.3.1
with:
path: /tmp/.buildx-cache
key: ${{ github.ref }}-${{ github.sha }}
Expand All @@ -168,13 +168,13 @@ jobs:
fi
- name: Cache SonarCloud packages
uses: actions/cache@v3.2.6
uses: actions/cache@v3.3.1
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar-${{ matrix.application }}
restore-keys: ${{ runner.os }}-sonar-${{ matrix.application }}
- name: Cache local Maven repository
uses: actions/cache@v3.2.6
uses: actions/cache@v3.3.1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ matrix.application }}-${{ hashFiles('**/${{ matrix.application }}/pom.xml') }}
Expand Down Expand Up @@ -266,7 +266,7 @@ jobs:
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Cache Docker layers
uses: actions/cache@v3.2.6
uses: actions/cache@v3.3.1
with:
path: /tmp/.buildx-cache
key: ${{ github.ref }}-${{ github.sha }}
Expand All @@ -283,13 +283,13 @@ jobs:
fi
- name: Cache SonarCloud packages
uses: actions/cache@v3.2.6
uses: actions/cache@v3.3.1
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar-${{ matrix.application }}
restore-keys: ${{ runner.os }}-sonar-${{ matrix.application }}
- name: Cache local Maven repository
uses: actions/cache@v3.2.6
uses: actions/cache@v3.3.1
with:
path: ~/.m2/repository
key: ${{ runner.os }}-maven-${{ matrix.application }}-${{ hashFiles('**/${{ matrix.application }}/pom.xml') }}
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/memcached/memcached-deployment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ spec:
tcpSocket:
port: 11211
- name: memcached-exporter
image: prom/memcached-exporter:v0.11.1
image: prom/memcached-exporter:v0.11.2
ports:
- containerPort: 9150
livenessProbe:
Expand Down
2 changes: 1 addition & 1 deletion kubernetes/monitoring/jenkins/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM jenkins/jenkins:2.394-alpine
FROM jenkins/jenkins:2.395-alpine
ARG BUILD_DATE
ARG VCS_REF

Expand Down

0 comments on commit b4799b9

Please sign in to comment.