Skip to content

Commit

Permalink
Merge branch 'main' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
yunus-qureshi committed Aug 3, 2023
2 parents b868b60 + 9242b7d commit 4645bfe
Show file tree
Hide file tree
Showing 181 changed files with 11,487 additions and 1,705 deletions.
1 change: 1 addition & 0 deletions .github/super-linter.env
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
BASH_SEVERITY=warning
DEFAULT_BRANCH=main
ERROR_ON_MISSING_EXEC_BIT=true
VALIDATE_ALL_CODEBASE=false
Expand Down
17 changes: 9 additions & 8 deletions .github/workflows/build-and-push-dev-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@ on:
inputs:
ol:
description: List of ol versions to build
default: 'oraclelinux7, oraclelinux8'
default: 'oraclelinux7, oraclelinux8, oraclelinux9'
required: false
lang:
description: List of languages to build
default: 'gcc-toolset, golang, nginx, nodejs, php, python, redis, ruby'
default: 'gcc-toolset, golang, nginx, nodejs, php, python, redis, ruby, haproxy'
required: false

# Default values for the builds triggered by the push event
env:
ol: 'oraclelinux7, oraclelinux8'
lang: 'gcc-toolset, golang, nodejs, nginx, php, python, redis, ruby'
ol: 'oraclelinux7, oraclelinux8, oraclelinux9'
lang: 'gcc-toolset, golang, nodejs, nginx, php, python, redis, ruby, haproxy'

jobs:
prepare:
Expand Down Expand Up @@ -84,11 +84,12 @@ jobs:
pushd "${lang}" >/dev/null || exit 1
for dockerfile in */Dockerfile; do
tag=$(dirname "${dockerfile}")
arch="linux/amd64"
multi=0
if [[ ! ${tag} =~ oracledb && ! ( ${ol} = "oraclelinux7" && ${lang} =~ ^(nodejs|php|ruby)$ ) ]]; then
arch="${arch},linux/arm64"
if [[ -f ${tag}/.skip-arm64 ]]; then
multi=0
arch="linux/amd64"
else
multi=1
arch="linux/amd64,linux/arm64"
fi
if [[ ${build_all} -eq 1 ]] || grep -q "${ol}/${lang}/${tag}" "${changes}"; then
echo "${ol};${lang};${tag};${arch};${multi}"
Expand Down
66 changes: 44 additions & 22 deletions .github/workflows/build-and-push-nosql-image.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,42 +11,64 @@ on:

env:
IMAGE_NAME: nosql
TAG: ce

jobs:
push:
name: Build and push NoSQL ce image

runs-on: ubuntu-latest
if: github.event_name == 'push'
permissions:
contents: read
packages: write

steps:
- uses: actions/checkout@v3

- name: Log into GitHub Container Registry
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u "${GITHUB_ACTOR,,}" --password-stdin

- name: Repository owner needs to be lowercase
-
name: Checkout
uses: actions/checkout@v3
-
name: Set up QEMU
uses: docker/setup-qemu-action@v2
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
-
name: Repository owner needs to be lowercase
id: repo-owner
run: |
REPO_OWNER="${{ github.repository_owner }}"
echo "repo-owner=${REPO_OWNER,,}" >> "$GITHUB_OUTPUT"
- name: Get current date
-
name: Get current date
id: date
run: echo "date=$(date +'%Y-%m')" >> "$GITHUB_OUTPUT"

- name: Build NoSQL ce image
run: |
cd NoSQL/ce
docker build --tag "ghcr.io/${{ steps.repo-owner.outputs.repo-owner }}/$IMAGE_NAME:$TAG" .
docker tag "ghcr.io/${{ steps.repo-owner.outputs.repo-owner }}/$IMAGE_NAME:$TAG" "ghcr.io/${{ steps.repo-owner.outputs.repo-owner }}/$IMAGE_NAME:latest-ce"
-
name: Login to Docker Hub
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Generate container image metadata
id: meta
uses: docker/metadata-action@v4
with:
images: ghcr.io/${{ steps.repo-owner.outputs.repo-owner }}/${{ env.IMAGE_NAME }}
flavor: |
latest=false
tags: |
type=raw,value=latest-ce
type=raw,value=${{ env.TAG }}
env:
TAG: ${{ steps.date.outputs.date }}-ce
TAG: ${{ steps.date.outputs.date }}-ce
-
name: Build and push
uses: docker/build-push-action@v4
with:
context: ./NoSQL/ce/
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

- name: Push image to GitHub Container Registry
run: |
docker push "ghcr.io/${{ steps.repo-owner.outputs.repo-owner }}/$IMAGE_NAME:$TAG"
docker push "ghcr.io/${{ steps.repo-owner.outputs.repo-owner }}/$IMAGE_NAME:latest-ce"
env:
TAG: ${{ steps.date.outputs.date }}-ce
70 changes: 46 additions & 24 deletions .github/workflows/build-and-push-nosql-sec-image.yml
Original file line number Diff line number Diff line change
@@ -1,52 +1,74 @@
name: Build and publish NoSQL container image to GitHub Container Registry
name: Build and publish NoSQL secure container image to GitHub Container Registry

on:
push:
branches:
- main
paths:
- 'NoSQL/ce-sec/*'
- '.github/workflows/build-and-push-nosql-image.yml'
- '.github/workflows/build-and-push-nosql-sec-image.yml'
workflow_dispatch:

env:
IMAGE_NAME: nosql
TAG: ce

jobs:
push:
name: Build and push NoSQL ce image

runs-on: ubuntu-latest
if: github.event_name == 'push'
permissions:
contents: read
packages: write

steps:
- uses: actions/checkout@v3

- name: Log into GitHub Container Registry
run: echo "${{ secrets.GITHUB_TOKEN }}" | docker login ghcr.io -u "${GITHUB_ACTOR,,}" --password-stdin

- name: Repository owner needs to be lowercase
-
name: Checkout
uses: actions/checkout@v3
-
name: Set up QEMU
uses: docker/setup-qemu-action@v2
-
name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
-
name: Repository owner needs to be lowercase
id: repo-owner
run: |
REPO_OWNER="${{ github.repository_owner }}"
echo "repo-owner=${REPO_OWNER,,}" >> "$GITHUB_OUTPUT"
- name: Get current date
-
name: Get current date
id: date
run: echo "date=$(date +'%Y-%m')" >> "$GITHUB_OUTPUT"

- name: Build NoSQL ce image
run: |
cd NoSQL/ce-sec
docker build --tag "ghcr.io/${{ steps.repo-owner.outputs.repo-owner }}/$IMAGE_NAME:$TAG" .
docker tag "ghcr.io/${{ steps.repo-owner.outputs.repo-owner }}/$IMAGE_NAME:$TAG" "ghcr.io/${{ steps.repo-owner.outputs.repo-owner }}/$IMAGE_NAME:latest-ce-sec"
env:
TAG: ${{ steps.date.outputs.date }}-ce-sec

- name: Push image to GitHub Container Registry
run: |
docker push "ghcr.io/${{ steps.repo-owner.outputs.repo-owner }}/$IMAGE_NAME:$TAG"
docker push "ghcr.io/${{ steps.repo-owner.outputs.repo-owner }}/$IMAGE_NAME:latest-ce-sec"
-
name: Login to Docker Hub
uses: docker/login-action@v2
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
-
name: Generate container image metadata
id: meta
uses: docker/metadata-action@v4
with:
images: ghcr.io/${{ steps.repo-owner.outputs.repo-owner }}/${{ env.IMAGE_NAME }}
flavor: |
latest=false
tags: |
type=raw,value=latest-ce-sec
type=raw,value=${{ env.TAG }}
env:
TAG: ${{ steps.date.outputs.date }}-ce-sec
-
name: Build and push
uses: docker/build-push-action@v4
with:
context: ./NoSQL/ce-sec/
platforms: linux/amd64,linux/arm64
push: true
tags: ${{ steps.meta.outputs.tags }}
labels: ${{ steps.meta.outputs.labels }}

2 changes: 1 addition & 1 deletion .github/workflows/super-linter.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
run: cat .github/super-linter.env >> "$GITHUB_ENV"

- name: Run Super Linter
uses: github/super-linter/slim@v4
uses: github/super-linter/slim@v5
env:
DEFAULT_BRANCH: main
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
/.github/workflows @Djelibeybi @AmedeeBulle
/GraalVM/ @mzachh
/NoSQL/ @dario-vega @mikebrey
/OracleAccessManagement/ @pratdash-orcl
/OracleAccessManagement/ @manjunathdhegde-2910
/OracleBI/ @sjvp
/OracleCoherence/ @thegridman
/OracleDatabase/ @gvenzl
Expand All @@ -16,7 +16,7 @@
/OracleHTTPServer/ @Prabhat-Kishore
/OracleIdentityGovernance/ @rishiagarwal-oracle
/OracleInstantClient/ @cjbj
/OracleInternetDirectory/ @pratdash-orcl @kuldeepbshah
/OracleInternetDirectory/ @manjunathdhegde-2910 @kuldeepbshah
/OracleJava/ @aureliogrb
/OracleLinuxDevelopers/ @Djelibeybi @AmedeeBulle
/OracleRestDataServices/ @gvenzl
Expand Down
21 changes: 18 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Contribution guidelines

<!-- markdownlint-disable MD036 -->
*Last updated: November 2022*
*Last updated: March 2023*

Oracle welcomes contributions to this repository from anyone.

Expand All @@ -12,7 +12,7 @@ submit your pull request.
If you have any questions about a possible submission, we encourage you to start
a discussion about the contribution to get feedback from other users.

## Contributing to the Oracle Docker Images repository
## Contributing code

All contributors are expected to adhere to our [code of conduct](CODE_OF_CONDUCT.md).

Expand Down Expand Up @@ -45,6 +45,14 @@ member of the [Oracle GitHub Organisation](https://github.com/orgs/oracle/people

Contact [Avi Miller](https://github.com/Djelibeybi) for more information.

## Opening issues

For bugs or enhancement requests, please file a GitHub issue unless it's
security related. When filing a bug remember that the better written the bug is,
the more likely it is to be fixed. If you think you've found a security
vulnerability, do not raise a GitHub issue and follow the instructions in our
[security policy](./SECURITY.md).

## Pull request process

1. Fork this repository
Expand Down Expand Up @@ -212,4 +220,11 @@ merged, but are generally frowned upon if breached.
* If a custom value must be provided by the end-user, the build or run should
gracefully fail if that value is not provided.

Copyright (c) 2017, 2022 Oracle and/or its affiliates.
## Code of conduct

Follow the [Golden Rule](https://en.wikipedia.org/wiki/Golden_Rule). If you'd
like more specific guidelines, see the [Contributor Covenant Code of Conduct][COC].

[COC]: https://www.contributor-covenant.org/version/1/4/code-of-conduct/

Copyright (c) 2017, 2023 Oracle and/or its affiliates.
6 changes: 3 additions & 3 deletions LICENSE.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Copyright (c) 2019 Oracle and/or its affiliates.
Copyright (c) 2019, 2023 Oracle and/or its affiliates.

The Universal Permissive License (UPL), Version 1.0

Subject to the condition set forth below, permission is hereby granted to any
Expand All @@ -12,7 +12,7 @@ Works (as defined below), to deal in both

(a) the Software, and
(b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
one is included with the Software (each a Larger Work to which the Software
one is included with the Software (each a "Larger Work" to which the Software
is contributed by such licensors),

without restriction, including without limitation the rights to copy, create
Expand Down
8 changes: 4 additions & 4 deletions NoSQL/README-sec.md
Original file line number Diff line number Diff line change
Expand Up @@ -413,8 +413,8 @@ For more information on [Oracle NoSQL][NOSQL] please review the
Oracle NoSQL Community Edition is released under the [Apache 2.0 License][Apache-2.0].
The Oracle NoSQL Database Community Edition image contains the Oracle OpenJDK which is
licensed under the [GNU General Public License v2.0 with Classpath Exception][GPLv2+CE]
The Oracle NoSQL Database Community Edition image image uses the GraalVM CE container image as its base image.
It is licensed under the [GNU General Public License v2.0 with Classpath Exception][GraalVM-License]
The files in this repository are licensed under the [Universal Permissive License 1.0](/LICENSE.txt)
Expand All @@ -424,9 +424,9 @@ Oracle provides no commercial support for the Oracle NoSQL Community Edition.
## Copyright
Copyright (c) 2017, 2022 Oracle and/or its affiliates.
Copyright (c) 2017, 2023 Oracle and/or its affiliates.
[NOSQL]: http://www.oracle.com/technetwork/database/database-technologies/nosqldb/overview/index.html
[DOCS]: https://docs.oracle.com/en/database/other-databases/nosql-database/index.html
[Apache-2.0]: https://docs.oracle.com/en/database/other-databases/nosql-database/22.3/license/index.html#NSXLI-GUID-006E432E-1965-45A2-AEDE-204BD05E1560
[GPLv2+CE]: http://openjdk.java.net/legal/gplv2+ce.html
[GraalVM-License]: https://github.com/graalvm/container/blob/master/LICENSE.md
8 changes: 4 additions & 4 deletions NoSQL/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -347,8 +347,8 @@ For more information on [Oracle NoSQL][NOSQL] please review the

Oracle NoSQL Community Edition is released under the [Apache 2.0 License][Apache-2.0].

The Oracle NoSQL Database Community Edition image contains the Oracle OpenJDK which is
licensed under the [GNU General Public License v2.0 with Classpath Exception][GPLv2+CE]
The Oracle NoSQL Database Community Edition image image uses the GraalVM CE container image as its base image.
It is licensed under the [GNU General Public License v2.0 with Classpath Exception][GraalVM-License]

The files in this repository are licensed under the [Universal Permissive License 1.0](/LICENSE.txt)

Expand All @@ -358,9 +358,9 @@ Oracle provides no commercial support for the Oracle NoSQL Community Edition.

## Copyright

Copyright (c) 2017, 2022 Oracle and/or its affiliates.
Copyright (c) 2017, 2023 Oracle and/or its affiliates.

[NOSQL]: http://www.oracle.com/technetwork/database/database-technologies/nosqldb/overview/index.html
[DOCS]: https://docs.oracle.com/en/database/other-databases/nosql-database/index.html
[Apache-2.0]: https://docs.oracle.com/en/database/other-databases/nosql-database/22.3/license/index.html#NSXLI-GUID-006E432E-1965-45A2-AEDE-204BD05E1560
[GPLv2+CE]: http://openjdk.java.net/legal/gplv2+ce.html
[GraalVM-License]: https://github.com/graalvm/container/blob/master/LICENSE.md
Loading

0 comments on commit 4645bfe

Please sign in to comment.