Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: SAP/devops-docker-neo-cli
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v8
Choose a base ref
...
head repository: SAP/devops-docker-neo-cli
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 20 commits
  • 9 files changed
  • 2 contributors

Commits on Jul 3, 2024

  1. chore: update neo sdk

    o-liver authored Jul 3, 2024
    Copy the full SHA
    7282df3 View commit details
  2. chore: update base image

    o-liver authored Jul 3, 2024
    Copy the full SHA
    ea856ac View commit details

Commits on Sep 18, 2024

  1. Update CONTRIBUTING.md

    o-liver authored Sep 18, 2024
    Copy the full SHA
    719fb17 View commit details
  2. Copy the full SHA
    ed38bd9 View commit details

Commits on Oct 9, 2024

  1. Copy the full SHA
    04444ad View commit details
  2. Merge pull request #47 from SAP/updateVersions

    Update versions
    o-liver authored Oct 9, 2024
    Copy the full SHA
    e76b9f0 View commit details

Commits on Apr 2, 2025

  1. bump version

    o-liver authored Apr 2, 2025
    Copy the full SHA
    e432992 View commit details
  2. bump version up

    o-liver authored Apr 2, 2025
    Copy the full SHA
    b7626fc View commit details
  3. Merge pull request #50 from SAP/bumpVersion

    bump version
    o-liver authored Apr 2, 2025
    Copy the full SHA
    a37a710 View commit details
  4. Copy the full SHA
    6c91830 View commit details
  5. Merge pull request #49 from SAP/renovate/configure

    chore: Configure Renovate
    o-liver authored Apr 2, 2025
    Copy the full SHA
    5b2825c View commit details
  6. fix: type as list

    o-liver committed Apr 2, 2025
    Copy the full SHA
    2fe9d33 View commit details
  7. Copy the full SHA
    7835d02 View commit details
  8. Copy the full SHA
    0f0eed4 View commit details

Commits on Apr 3, 2025

  1. Merge pull request #52 from SAP/renovate/useSha

    use sha for gh actions
    o-liver authored Apr 3, 2025
    Copy the full SHA
    d2b8427 View commit details
  2. Copy the full SHA
    91d87e2 View commit details
  3. Merge pull request #53 from SAP/renovate/fix

    fix: types as list
    o-liver authored Apr 3, 2025
    Copy the full SHA
    f65a35d View commit details
  4. Copy the full SHA
    9b713cd View commit details

Commits on Apr 4, 2025

  1. Apply suggestions from code review

    Co-authored-by: Kay Wegner <kay.wegner@sap.com>
    o-liver and kaylinche authored Apr 4, 2025
    Copy the full SHA
    7698656 View commit details
  2. Merge pull request #48 from SAP/o-liver-patch-1

    Update CONTRIBUTING info
    o-liver authored Apr 4, 2025
    Copy the full SHA
    14becb8 View commit details
Showing with 104 additions and 10 deletions.
  1. +17 −0 .github/renovate.json5
  2. +1 −1 .github/workflows/build.yml
  3. +1 −1 .github/workflows/main.yml
  4. +1 −1 .github/workflows/push.yml
  5. +2 −2 .github/workflows/release.yml
  6. +2 −2 .github/workflows/reuse.yaml
  7. +66 −1 CONTRIBUTING.md
  8. +12 −0 CONTRIBUTING_USING_GENAI.md
  9. +2 −2 Dockerfile
17 changes: 17 additions & 0 deletions .github/renovate.json5
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"config:recommended",
'helpers:pinGitHubActionDigests'
],
"reviewers": ["o-liver", "srinikitha09", "kaylinche"],
"dockerfile": {
"fileMatch": ["Dockerfile"],
"arg": {
"NEO_SDK_VERSION": {
"datasource": "maven",
"depName": "com.sap.cloud:neo-javaee7-wp-maven-plugin"
}
}
}
}
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Build
run: |
docker build .
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@master
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Haskell Dockerfile Linter
uses: docker://cdssnc/docker-lint-github-action
with:
2 changes: 1 addition & 1 deletion .github/workflows/push.yml
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ jobs:
push:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Run CI
run: |
echo ${{ secrets.DOCKERHUB_PASSWORD }} | docker login -u ${{ secrets.DOCKERHUB_USER }} --password-stdin
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -2,14 +2,14 @@ name: Create new Release

on:
repository_dispatch:
types: perform-release
types: [perform-release]
workflow_dispatch:

jobs:
create-release:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: Prepare Release
run: |
CURRENT_VERSION_LONG=$(curl --silent "https://api.github.com/repos/SAP/devops-docker-neo-cli/releases" | jq -r '.[].tag_name' | head -n1)
4 changes: 2 additions & 2 deletions .github/workflows/reuse.yaml
Original file line number Diff line number Diff line change
@@ -6,6 +6,6 @@ jobs:
test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
- name: REUSE Compliance Check
uses: fsfe/reuse-action@v1.1
uses: fsfe/reuse-action@bb774aa972c2a89ff34781233d275075cbddf542 # v5.0.0
67 changes: 66 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,68 @@
# Guidance on how to contribute

There are two primary ways to help:
* using the issue tracker, and
* changing the code-base.

## General Remarks

You are welcome to contribute content (code, documentation etc.) to this open source project.

There are some important things to know:

1. You must **comply to the license of this project**, **accept the Developer Certificate of Origin** (see below) before being able to contribute. The acknowledgement to the DCO will usually be requested from you as part of your first pull request to this project.
2. Please **adhere to our [Code of Conduct](CODE_OF_CONDUCT.md)**.
3. If you plan to use **generative AI for your contribution**, please see our guideline below.
4. **Not all proposed contributions can be accepted**. Some features may fit another project better or doesn't fit the general direction of this project. Of course, this doesn't apply to most bug fixes, but a major feature implementation for instance needs to be discussed with one of the maintainers first. Possibly, one who touched the related code or module recently. The more effort you invest, the better you should clarify in advance whether the contribution will match the project's direction. The best way would be to just open an issue to discuss the feature you plan to implement (make it clear that you intend to contribute). We will then forward the proposal to the respective code owner. This avoids disappointment.

## Developer Certificate of Origin (DCO)

Due to legal reasons, contributors will be asked to accept a DCO before they submit the first pull request to this projects, this happens in an automated fashion during the submission process. SAP uses [the standard DCO text of the Linux Foundation](https://developercertificate.org/).
Contributors will be asked to accept a DCO before they submit the first pull request to these projects, this happens in an automated fashion during the submission process. SAP uses [the standard DCO text of the Linux Foundation](https://developercertificate.org/).

## Contributing with AI-generated code

As artificial intelligence evolves, AI-generated code is becoming valuable for many software projects, including open-source initiatives. While we recognize the potential benefits of incorporating AI-generated content into our open-source projects there a certain requirements that need to be reflected and adhered to when making contributions.

Please see our [guideline for AI-generated code contributions to SAP Open Source Software Projects](CONTRIBUTING_USING_GENAI.md) for these requirements.

## How to Contribute

1. Make sure the change is welcome (see [General Remarks](#general-remarks)).
2. Create a branch by forking the repository and apply your change.
3. Commit and push your change on that branch.
4. Create a pull request in the repository using this branch.
5. Follow the link posted by the CLA assistant to your pull request and accept it, as described above.
6. Wait for our code review and approval, possibly enhancing your change on request.
- Note that the maintainers have many duties. So, depending on the required effort for reviewing, testing, and clarification, this may take a while.
7. Once the change has been approved and merged, we will inform you in a comment.
8. Celebrate!

## Using the issue tracker

Use the issue tracker to suggest feature requests, report bugs, and ask
questions. This is also a great way to connect with the developers of the
project as well as others who are interested in this solution.

Use the issue tracker to find ways to contribute. Find a bug or a feature,
mention in the issue that you will take on that effort, then follow the
guidance below.

## Changing the code-base

Generally speaking, you should fork this repository, make changes in your own
fork, and then submit a pull-request. All new code should have been thoroughly
tested end-to-end in order to validate implemented features and the presence or
lack of defects. All new scripts and docker files _must_ come with automated (unit)
tests.

The contract of functionality exposed by docker files functionality needs
to be documented, so it can be properly used. Implementation of a functionality
and its documentation shall happen within the same commit(s).

#### Consistent USER Instruction in the Dockerfile

Set the user name (or UID) and the user group (or GID) to UID 1000 and GID 1000 to be consistent with the Jenkins image.

````
USER 1000:1000
````
12 changes: 12 additions & 0 deletions CONTRIBUTING_USING_GENAI.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Guideline for AI-generated code contributions to SAP Open Source Software Projects

As artificial intelligence evolves, AI-generated code is becoming valuable for many software projects, including open-source initiatives. While we recognize the potential benefits of incorporating AI-generated content into our open-source projects there are certain requirements that need to be reflected and adhered to when making contributions.

When using AI-generated code contributions in OSS Projects, their usage needs to align with Open-Source Software values and legal requirements. We have established these essential guidelines to help contributors navigate the complexities of using AI tools while maintaining compliance with open-source licenses and the broader [Open-Source Definition](https://opensource.org/osd).

AI-generated code or content can be contributed to SAP Open Source Software projects if the following conditions are met:

1. **Compliance with AI Tool Terms and Conditions**: Contributors must ensure that the AI tool's terms and conditions do not impose any restrictions on the tool's output that conflict with the project's open-source license or intellectual property policies. This includes ensuring that the AI-generated content adheres to the [Open-Source Definition](https://opensource.org/osd).
2. **Filtering Similar Suggestions**: Contributors must use features provided by AI tools to suppress responses that are similar to third-party materials or flag similarities. We only accept contributions from AI tools with such filtering options. If the AI tool flags any similarities, contributors must review and ensure compliance with the licensing terms of such materials before including them in the project.
3. **Management of Third-Party Materials**: If the AI tool's output includes pre-existing copyrighted materials, including open-source code authored or owned by third parties, contributors must verify that they have the necessary permissions from the original owners. This typically involves ensuring that there is an open-source license or public domain declaration that is compatible with the project's licensing policies. Contributors must also provide appropriate notice and attribution for these third-party materials, along with relevant information about the applicable license terms.
4. **Employer Policies Compliance**: If AI-generated content is contributed in the context of employment, contributors must also adhere to their employer’s policies. This ensures that all contributions are made with proper authorization and respect for relevant corporate guidelines.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
FROM maven:3.5-jdk-8-alpine
FROM maven:3.6-jdk-8-alpine

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

ARG NEO_SDK_VERSION=1.163.6
ARG NEO_SDK_VERSION=1.196.6

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