Skip to content

Commit 9b713cd

Browse files
authored
Merge branch 'master' into o-liver-patch-1
2 parents ed38bd9 + f65a35d commit 9b713cd

File tree

7 files changed

+26
-9
lines changed

7 files changed

+26
-9
lines changed

.github/renovate.json5

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
3+
"extends": [
4+
"config:recommended",
5+
'helpers:pinGitHubActionDigests'
6+
],
7+
"reviewers": ["o-liver", "srinikitha09", "kaylinche"],
8+
"dockerfile": {
9+
"fileMatch": ["Dockerfile"],
10+
"arg": {
11+
"NEO_SDK_VERSION": {
12+
"datasource": "maven",
13+
"depName": "com.sap.cloud:neo-javaee7-wp-maven-plugin"
14+
}
15+
}
16+
}
17+
}

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
build:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v3
7+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
88
- name: Build
99
run: |
1010
docker build .

.github/workflows/main.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ jobs:
44
build:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@master
7+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
88
- name: Haskell Dockerfile Linter
99
uses: docker://cdssnc/docker-lint-github-action
1010
with:

.github/workflows/push.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
push:
1313
runs-on: ubuntu-latest
1414
steps:
15-
- uses: actions/checkout@v3
15+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1616
- name: Run CI
1717
run: |
1818
echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USER }} --password-stdin

.github/workflows/release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,14 @@ name: Create new Release
22

33
on:
44
repository_dispatch:
5-
types: perform-release
5+
types: [perform-release]
66
workflow_dispatch:
77

88
jobs:
99
create-release:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v3
12+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1313
- name: Prepare Release
1414
run: |
1515
CURRENT_VERSION_LONG=$(curl --silent "https://api.github.com/repos/SAP/devops-docker-neo-cli/releases" | jq -r '.[].tag_name' | head -n1)

.github/workflows/reuse.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ jobs:
66
test:
77
runs-on: ubuntu-latest
88
steps:
9-
- uses: actions/checkout@v3
9+
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
1010
- name: REUSE Compliance Check
11-
uses: fsfe/reuse-action@v1.1
11+
uses: fsfe/reuse-action@bb774aa972c2a89ff34781233d275075cbddf542 # v5.0.0

Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
FROM maven:3.5-jdk-8-alpine
1+
FROM maven:3.6-jdk-8-alpine
22

33
LABEL org.opencontainers.image.source=https://github.com/SAP/devops-docker-neo-cli
44
LABEL org.opencontainers.image.description="An image for the SAP neo cli"
55
LABEL org.opencontainers.image.licenses=Apache-2.0
66

7-
ARG NEO_SDK_VERSION=1.163.6
7+
ARG NEO_SDK_VERSION=1.196.6
88

99
RUN apk add --no-cache bash && \
1010
mvn --batch-mode com.sap.cloud:neo-javaee7-wp-maven-plugin:${NEO_SDK_VERSION}:install-sdk -DsdkInstallPath=sdk -Dincludes=tools/**,license/**,sdk.version && \

0 commit comments

Comments
 (0)