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: singularityhub/sregistry
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.1.38
Choose a base ref
...
head repository: singularityhub/sregistry
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref

Commits on Jul 27, 2021

  1. adding GitHub citation file

    Signed-off-by: vsoch <vsoch@users.noreply.github.com>
    vsoch committed Jul 27, 2021
    Copy the full SHA
    fa7d256 View commit details

Commits on Sep 25, 2021

  1. Copy the full SHA
    69bbd72 View commit details

Commits on Nov 11, 2021

  1. change: s3 and s3_external obj in minio.py for SSL use (#384)

    * Set attributes correctly for SSL use
    
    The 'verify' attribute is now correctly set to True or False, accordingly to the MINIO_SSL variable which determines if SSL is used in the setup.
    
    * Updatet s3 and s3_external obj in minio.py for SSL use (#380)
    
    add: auto set "verify" attribute of s3 and s3_external obj in minio.py for SSL use (1.1.39). See #380 for more info
    hashkeks authored Nov 11, 2021
    Copy the full SHA
    49e644b View commit details
  2. Automated deployment to update contributors 2021-11-11

    github-actions committed Nov 11, 2021
    Copy the full SHA
    b581db0 View commit details
  3. Merge pull request #385 from singularityhub/contributors/update-2021-…

    …11-11
    
    [tributors] contributors/update-2021-11-11
    vsoch authored Nov 11, 2021
    Copy the full SHA
    4509898 View commit details

Commits on Feb 10, 2022

  1. Bump django from 2.2.24 to 2.2.27

    Bumps [django](https://github.com/django/django) from 2.2.24 to 2.2.27.
    - [Release notes](https://github.com/django/django/releases)
    - [Commits](django/django@2.2.24...2.2.27)
    
    ---
    updated-dependencies:
    - dependency-name: django
      dependency-type: direct:production
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Feb 10, 2022
    Copy the full SHA
    d8ea8d5 View commit details
  2. Merge pull request #394 from singularityhub/dependabot/pip/django-2.2.27

    Bump django from 2.2.24 to 2.2.27
    vsoch authored Feb 10, 2022
    Copy the full SHA
    9abb177 View commit details
  3. Automated deployment to update contributors 2022-02-10

    github-actions committed Feb 10, 2022
    Copy the full SHA
    9848662 View commit details
  4. Merge pull request #395 from singularityhub/contributors/update-2022-…

    …02-10
    
    [tributors] contributors/update-2022-02-10
    vsoch authored Feb 10, 2022
    Copy the full SHA
    a3a19a0 View commit details

Commits on Apr 22, 2022

  1. Bump django from 2.2.27 to 2.2.28

    Bumps [django](https://github.com/django/django) from 2.2.27 to 2.2.28.
    - [Release notes](https://github.com/django/django/releases)
    - [Commits](django/django@2.2.27...2.2.28)
    
    ---
    updated-dependencies:
    - dependency-name: django
      dependency-type: direct:production
    ...
    
    Signed-off-by: dependabot[bot] <support@github.com>
    dependabot[bot] authored Apr 22, 2022
    Copy the full SHA
    a43855e View commit details

Commits on Apr 23, 2022

  1. Merge pull request #399 from singularityhub/dependabot/pip/django-2.2.28

    Bump django from 2.2.27 to 2.2.28
    vsoch authored Apr 23, 2022
    Copy the full SHA
    efea2e8 View commit details

Commits on Sep 17, 2022

  1. updating sregistry with new minio, docker compose

    also updating license headers, bumping version,
    and running isort and black. The docs are also now
    updater with newer Singularity interactions, and
    docker-compose is changed to docker compose.
    
    Signed-off-by: vsoch <vsoch@users.noreply.github.com>
    vsoch committed Sep 17, 2022
    Copy the full SHA
    a703ec6 View commit details

Commits on Sep 19, 2022

  1. Merge pull request #405 from singularityhub/tweak-compose-files

    updating sregistry with new minio, docker compose
    vsoch authored Sep 19, 2022
    Copy the full SHA
    8b38d35 View commit details
  2. Automated deployment to update contributors 2022-09-19

    github-actions committed Sep 19, 2022
    Copy the full SHA
    2f04460 View commit details
  3. Merge pull request #406 from singularityhub/contributors/update-2022-…

    …09-19
    
    [tributors] contributors/update-2022-09-19
    vsoch authored Sep 19, 2022
    Copy the full SHA
    8a9fb8b View commit details

Commits on Oct 13, 2022

  1. Allowing setting config vars from environment (#409)

    * allowing setting config vars from environment
    * refactor to use a single settings.py, allow a settings.yaml
    * consolidate secrets into same settings
    
    the user can now define variables directly in settings.py,
    via an external secrets.py or settings.yaml, or in
    the environment with SREGISTRY_ as a prefix.
    * ensure linting is done for new release
    * ensure SECRET_KEY also honored in environment
    
    Signed-off-by: vsoch <vsoch@users.noreply.github.com>
    vsoch authored Oct 13, 2022
    Copy the full SHA
    dfff8fd View commit details
  2. Automated deployment to update contributors 2022-10-13 (#411)

    Co-authored-by: github-actions <github-actions@users.noreply.github.com>
    github-actions[bot] and github-actions authored Oct 13, 2022
    Copy the full SHA
    cdc23db View commit details

Commits on Mar 24, 2023

  1. Adhere to YAML syntax

    Use colon instead of equal sign.
    SethosII authored Mar 24, 2023
    Copy the full SHA
    5df1b1f View commit details
  2. Merge pull request #413 from SethosII/patch-1

    Adhere to YAML syntax in dummy-settings.yaml
    vsoch authored Mar 24, 2023
    Copy the full SHA
    20704d4 View commit details
  3. Automated deployment to update contributors 2023-03-24

    github-actions committed Mar 24, 2023
    Copy the full SHA
    3c430bd View commit details
  4. Merge pull request #414 from singularityhub/contributors/update-2023-…

    …03-24
    
    [tributors] contributors/update-2023-03-24
    vsoch authored Mar 24, 2023
    Copy the full SHA
    be3bc13 View commit details
  5. Automated deployment to update contributors 2023-03-24

    github-actions committed Mar 24, 2023
    Copy the full SHA
    31a0c39 View commit details
  6. Merge pull request #415 from singularityhub/contributors/update-2023-…

    …03-24
    
    [tributors] contributors/update-2023-03-24
    vsoch authored Mar 24, 2023
    Copy the full SHA
    1cce4be View commit details

Commits on Mar 27, 2023

  1. Add missing package

    Package python-jose is required for LDAP authentication.
    SethosII authored Mar 27, 2023
    Copy the full SHA
    b75a906 View commit details
  2. Merge pull request #418 from SethosII/patch-2

    Add missing package
    vsoch authored Mar 27, 2023
    Copy the full SHA
    c0a03c9 View commit details

Commits on Mar 28, 2023

  1. Remove wrong information (#417)

    * Remove wrong information
    Automated lookup attributed false information.
    
    * Add correct information
    SethosII authored Mar 28, 2023
    Copy the full SHA
    ac5b129 View commit details
  2. Automated deployment to update contributors 2023-03-28 (#420)

    Co-authored-by: github-actions <github-actions@users.noreply.github.com>
    github-actions[bot] and github-actions authored Mar 28, 2023
    Copy the full SHA
    4549462 View commit details
  3. Small documentation fixes (#419)

    * The openldap container doesn't include bash, use sh instead
    * Fix location of the login page screenshot
    * Move LDAP image to assets folder and fix image link
    * Move Globus images to assets folder and fix image links
    SethosII authored Mar 28, 2023
    Copy the full SHA
    a4b0bf0 View commit details

Commits on Apr 6, 2023

  1. update dockerfile base (#421)

    * update dockerfile base
    * also using default models JsonField and setting default autofield
    * pin django 4.2
    
    Signed-off-by: vsoch <vsoch@users.noreply.github.com>
    vsoch authored Apr 6, 2023
    Copy the full SHA
    2fdfc1f View commit details
  2. Automated deployment to update contributors 2023-04-06 (#422)

    Co-authored-by: github-actions <github-actions@users.noreply.github.com>
    github-actions[bot] and github-actions authored Apr 6, 2023
    Copy the full SHA
    5a26a24 View commit details

Commits on Apr 27, 2023

  1. build to ghcr.io (#424)

    * build to ghcr.io
    
    Signed-off-by: vsoch <vsoch@users.noreply.github.com>
    vsoch authored Apr 27, 2023
    Copy the full SHA
    df1577c View commit details
  2. use master branch of tributors

    vsoch authored Apr 27, 2023
    Copy the full SHA
    36ff021 View commit details
  3. Automated deployment to update contributors 2023-04-27 (#425)

    Co-authored-by: github-actions <github-actions@users.noreply.github.com>
    github-actions[bot] and github-actions authored Apr 27, 2023
    Copy the full SHA
    c4c2605 View commit details

Commits on Apr 30, 2023

  1. fix: exclude .tributors from pre-commit (#427)

    * fix: exclude `.tributors` from pre-commit
    
    Signed-off-by: Vladislav Doster <mvdoster@gmail.com>
    vladdoster authored Apr 30, 2023
    Copy the full SHA
    33680c2 View commit details

Commits on May 1, 2023

  1. Copy the full SHA
    7d94504 View commit details
  2. Merge pull request #426 from vladdoster/master

    fix: remove duplicate shub setting
    vsoch authored May 1, 2023
    Copy the full SHA
    ee23901 View commit details

Commits on Jun 9, 2023

  1. allow setting of gitlab scope from env or settings file (#435)

    * allow setting of gitlab scope from env or settings file, add config dumper
    * move settings debug into a script
    * move settings script to a django management script
    * rework list defaults a little so that is matches other defaults
    * remove header as the MPL does not require them in all files
    * Just overwrite the values, if there is one
    * change version for new settings
    * cleanup some flake8 issues
    * updates for pre-commit
    * more linting issues
    
    ---------
    
    Co-authored-by: Evan J. Felix <evan.felix@pnnl.gov>
    karcaw and Evan J. Felix authored Jun 9, 2023
    Copy the full SHA
    41e4a65 View commit details
  2. Automated deployment to update contributors 2023-06-09 (#437)

    Co-authored-by: github-actions <github-actions@users.noreply.github.com>
    github-actions[bot] and github-actions authored Jun 9, 2023
    Copy the full SHA
    5a90099 View commit details

Commits on Sep 14, 2023

  1. Copy the full SHA
    675fb4d View commit details

Commits on Jul 2, 2024

  1. fix: remove download buttons from UI (#446)

    * fix: remove download buttons from ui
    
    Also removing references to sregistry global client
    
    Signed-off-by: vsoch <vsoch@users.noreply.github.com>
    vsoch authored Jul 2, 2024
    Copy the full SHA
    ae1c365 View commit details
  2. Automated deployment to update contributors 2024-07-02 (#448)

    Co-authored-by: github-actions <github-actions@users.noreply.github.com>
    github-actions[bot] and github-actions authored Jul 2, 2024
    Copy the full SHA
    10fc5d5 View commit details
Showing 312 changed files with 3,923 additions and 3,712 deletions.
35 changes: 34 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -203,7 +203,40 @@
"avatar_url": [
"https://avatars.githubusercontent.com/u/44250868?v=4"
]
},
{
"login": "hashkeks",
"name": "Cedric",
"contributions": [
"code"
],
"profile": "https://github.com/hashkeks",
"avatar_url": [
"https://avatars.githubusercontent.com/u/34633191?v=4"
]
},
{
"login": "SethosII",
"name": "Paul Jähne",
"contributions": [
"code"
],
"profile": "https://github.com/SethosII",
"avatar_url": [
"https://avatars.githubusercontent.com/u/4445745?v=4"
]
},
{
"login": "karcaw",
"name": "Evan Felix",
"contributions": [
"code"
],
"profile": "https://github.com/karcaw",
"avatar_url": [
"https://avatars.githubusercontent.com/u/663031?v=4"
]
}
],
"contributorsPerLine": 7
}
}
226 changes: 0 additions & 226 deletions .circleci/config.yml

This file was deleted.

6 changes: 3 additions & 3 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -25,8 +25,8 @@ all your interactions with the project members and users.
4. The project's default copyright and header have been included in any new
source files.
5. All (major) changes to Singularity Registry must be documented in
[docs](docs). If your PR changes a core functionality, please
include clear description of the changes in your PR so that the docs
[docs](docs). If your PR changes a core functionality, please
include clear description of the changes in your PR so that the docs
can be updated, or better, submit another PR to update the docs directly.
6. If necessary, update the README.md.
7. The pull request will be reviewed by others, and the final merge must be
@@ -98,7 +98,7 @@ an incident. Further details of specific enforcement policies may be posted
separately.

Project maintainers, contributors and users who do not follow or enforce the
Code of Conduct in good faith may face temporary or permanent repercussions
Code of Conduct in good faith may face temporary or permanent repercussions
with their involvement in the project as determined by the project's leader(s).

## Attribution
2 changes: 0 additions & 2 deletions .github/ISSUE_TEMPLATE/question.md
Original file line number Diff line number Diff line change
@@ -3,5 +3,3 @@ name: Question
about: What's on your mind?

---


Original file line number Diff line number Diff line change
@@ -3,5 +3,3 @@ name: Request for Documentation or Tutorial
about: request improvements or changes to docs or a tutorial

---


4 changes: 4 additions & 0 deletions .github/dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
pre-commit
black==23.3.0
isort
flake8
56 changes: 56 additions & 0 deletions .github/workflows/build-deploy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
name: Build and Deploy Container

on:
# Publish packages on release
release:
types: [published]

pull_request: []
workflow_dispatch:

# On push to main we build and deploy images
push:
branches:
- main

jobs:
build:
permissions:
packages: write

env:
container: ghcr.io/singularityhub/sregistry
runs-on: ubuntu-latest
name: Build
steps:
- name: Checkout
uses: actions/checkout@v4
- name: Build Container
run: |
docker build -t ${{ env.container }}:latest .
cd ./nginx
docker build -t ${{ env.container }}_nginx:latest .
- name: GHCR Login
if: (github.event_name != 'pull_request')
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Tag and Push Release Image
if: (github.event_name == 'release')
run: |
tag=$(cat ./VERSION)
echo "Tagging and releasing ${{ env.container }}:${tag}"
docker tag ${{ env.container }}:latest ${{ env.container }}:${tag}
docker tag ${{ env.container }}:latest ${{ env.container }}_nginx:${tag}
docker push ${{ env.container }}:${tag}
docker push ${{ env.container }}_nginx:${tag}
- name: Deploy
if: (github.event_name != 'pull_request')
run: |
docker push ${{ env.container }}:latest
docker push ${{ env.container }}_nginx:latest
14 changes: 7 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -11,18 +11,18 @@ jobs:
formatting:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1

- uses: actions/checkout@v4
- name: Check for typos in docs
uses: crate-ci/typos@592b36d23c62cb378f6097a292bc902ee73f93ef # version 1.0.4
with:
files: ./docs ./README.md
uses: crate-ci/typos@7ad296c72fa8265059cc03d1eda562fbdfcd6df2 # v1.9.0
with:
files: ./docs/_docs ./docs/_posts ./README.md

- name: Setup black linter
run: conda create --quiet --name black black

- name: Lint python code
- name: Lint and format Python code
run: |
export PATH="/usr/share/miniconda/bin:$PATH"
source activate black
black --check shub
pip install -r .github/dev-requirements.txt
pre-commit run --all-files
Loading