Skip to content

Commit 79d6e57

Browse files
kcondonkcondon
authored
Merge pull request #9386 from IQSS/develop
v5.13
2 parents cf90431 + 1aabf69 commit 79d6e57

File tree

241 files changed

+12287
-2639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

241 files changed

+12287
-2639
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
---
22
name: Bug report
3-
about: Did you encounter something unexpected or incorrect in the Dataverse software? We'd like to hear about it!
3+
about: Did you encounter something unexpected or incorrect in the Dataverse software?
4+
We'd like to hear about it!
45
title: ''
56
labels: ''
67
assignees: ''
78

89
---
10+
911
<!--
1012
Thank you for contributing to the Dataverse Project through the creation of a bug report!
1113

‎.github/ISSUE_TEMPLATE/feature_request.md

+2-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ labels: ''
66
assignees: ''
77

88
---
9+
910
<!--
1011
Thank you for contributing to the Dataverse Project through the creation of a feature request!
1112
@@ -32,4 +33,4 @@ Start below this comment section.
3233
**Any brand new behavior do you want to add to Dataverse?**
3334

3435

35-
**Any related open or closed issues to this feature request?**
36+
**Any open or closed issues related to this feature request?**

‎.github/SECURITY.md

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
# Security
2+
3+
To report a security vulnerability please email [email protected] as explained at https://guides.dataverse.org/en/latest/installation/config.html#reporting-security-issues
4+
5+
Advice on securing your installation can be found at https://guides.dataverse.org/en/latest/installation/config.html#securing-your-installation
6+
7+
Security practices and procedures used by the Dataverse team are described at https://guides.dataverse.org/en/latest/developers/security.html

‎.github/workflows/container_base_push.yml

+85
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
---
2+
name: Container Base Module
3+
4+
on:
5+
push:
6+
branches:
7+
- 'develop'
8+
- 'master'
9+
paths:
10+
- 'modules/container-base/**'
11+
- 'modules/dataverse-parent/pom.xml'
12+
- '.github/workflows/container_base_push.yml'
13+
pull_request:
14+
branches:
15+
- 'develop'
16+
- 'master'
17+
paths:
18+
- 'modules/container-base/**'
19+
- 'modules/dataverse-parent/pom.xml'
20+
- '.github/workflows/container_base_push.yml'
21+
22+
env:
23+
IMAGE_TAG: unstable
24+
25+
jobs:
26+
build:
27+
name: Build image
28+
runs-on: ubuntu-latest
29+
permissions:
30+
contents: read
31+
packages: read
32+
strategy:
33+
matrix:
34+
jdk: [ '11' ]
35+
# Only run in upstream repo - avoid unnecessary runs in forks
36+
if: ${{ github.repository_owner == 'IQSS' }}
37+
38+
steps:
39+
- name: Checkout repository
40+
uses: actions/checkout@v3
41+
42+
- name: Set up JDK ${{ matrix.jdk }}
43+
uses: actions/setup-java@v3
44+
with:
45+
java-version: ${{ matrix.jdk }}
46+
distribution: 'adopt'
47+
- name: Cache Maven packages
48+
uses: actions/cache@v3
49+
with:
50+
path: ~/.m2
51+
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
52+
restore-keys: ${{ runner.os }}-m2
53+
54+
- name: Build base container image with local architecture
55+
run: mvn -f modules/container-base -Pct package
56+
57+
# Run anything below only if this is not a pull request.
58+
# Accessing, pushing tags etc. to DockerHub will only succeed in upstream because secrets.
59+
60+
- if: ${{ github.event_name == 'push' && github.ref_name == 'develop' }}
61+
name: Push description to DockerHub
62+
uses: peter-evans/dockerhub-description@v3
63+
with:
64+
username: ${{ secrets.DOCKERHUB_USERNAME }}
65+
password: ${{ secrets.DOCKERHUB_TOKEN }}
66+
repository: gdcc/base
67+
short-description: "Dataverse Base Container image providing Payara application server and optimized configuration"
68+
readme-filepath: ./modules/container-base/README.md
69+
70+
- if: ${{ github.event_name != 'pull_request' }}
71+
name: Log in to the Container registry
72+
uses: docker/login-action@v2
73+
with:
74+
registry: ${{ env.REGISTRY }}
75+
username: ${{ secrets.DOCKERHUB_USERNAME }}
76+
password: ${{ secrets.DOCKERHUB_TOKEN }}
77+
- if: ${{ github.event_name != 'pull_request' }}
78+
name: Set up QEMU for multi-arch builds
79+
uses: docker/setup-qemu-action@v2
80+
- name: Re-set image tag based on branch
81+
if: ${{ github.ref_name == 'master' }}
82+
run: echo "IMAGE_TAG=stable"
83+
- if: ${{ github.event_name != 'pull_request' }}
84+
name: Deploy multi-arch base container image to Docker Hub
85+
run: mvn -f modules/container-base -Pct deploy -Dbase.image.tag=${{ env.IMAGE_TAG }}

‎.github/workflows/shellcheck.yml

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: "Shellcheck"
2+
on:
3+
push:
4+
paths:
5+
- conf/solr/**
6+
- modules/container-base/**
7+
pull_request:
8+
paths:
9+
- conf/solr/**
10+
- modules/container-base/**
11+
jobs:
12+
shellcheck:
13+
name: Shellcheck
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v2
17+
- name: shellcheck
18+
uses: reviewdog/action-shellcheck@v1
19+
with:
20+
github_token: ${{ secrets.github_token }}
21+
reporter: github-pr-review # Change reporter.
22+
fail_on_error: true
23+
# Container base image uses dumb-init shebang, so nail to using bash
24+
shellcheck_flags: "--shell=bash --external-sources"

‎.github/workflows/shellspec.yml

-12
Original file line numberDiff line numberDiff line change
@@ -13,18 +13,6 @@ on:
1313
env:
1414
SHELLSPEC_VERSION: 0.28.1
1515
jobs:
16-
shellcheck:
17-
name: Shellcheck
18-
runs-on: ubuntu-latest
19-
steps:
20-
- uses: actions/checkout@v2
21-
- name: shellcheck
22-
uses: reviewdog/action-shellcheck@v1
23-
with:
24-
github_token: ${{ secrets.github_token }}
25-
reporter: github-pr-review # Change reporter.
26-
fail_on_error: true
27-
exclude: "./tests/shell/*"
2816
shellspec-ubuntu:
2917
name: "Ubuntu"
3018
runs-on: ubuntu-latest

‎conf/keycloak/docker-compose.yml

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
version: "3.9"
2+
3+
services:
4+
5+
keycloak:
6+
image: 'jboss/keycloak:16.1.1'
7+
environment:
8+
- KEYCLOAK_USER=kcadmin
9+
- KEYCLOAK_PASSWORD=kcpassword
10+
- KEYCLOAK_IMPORT=/tmp/oidc-realm.json
11+
- KEYCLOAK_LOGLEVEL=DEBUG
12+
ports:
13+
- "8090:8080"
14+
volumes:
15+
- './oidc-realm.json:/tmp/oidc-realm.json'

‎conf/keycloak/oidc-keycloak-auth-provider.json

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"id": "oidc-keycloak",
3+
"factoryAlias": "oidc",
4+
"title": "OIDC-Keycloak",
5+
"subtitle": "OIDC-Keycloak",
6+
"factoryData": "type: oidc | issuer: http://localhost:8090/auth/realms/oidc-realm | clientId: oidc-client | clientSecret: ss6gE8mODCDfqesQaSG3gwUwZqZt547E",
7+
"enabled": true
8+
}

0 commit comments

Comments
 (0)