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: 2.1.0
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
  • 12 commits
  • 29 files changed
  • 6 contributors

Commits on Apr 6, 2023

  1. 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
11 changes: 11 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
@@ -225,6 +225,17 @@
"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.

2 changes: 1 addition & 1 deletion .github/dev-requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
pre-commit
black
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
3 changes: 1 addition & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -11,8 +11,7 @@ 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@7ad296c72fa8265059cc03d1eda562fbdfcd6df2 # v1.9.0
with:
6 changes: 3 additions & 3 deletions .github/workflows/update-contributors.yml
Original file line number Diff line number Diff line change
@@ -11,11 +11,11 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout Repository
uses: actions/checkout@v2
uses: actions/checkout@v4
- name: Tributors Update

# Important! Update to release https://github.com/con/tributors
uses: con/tributors@0.0.19
uses: con/tributors@master
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
@@ -75,7 +75,7 @@ jobs:
echo "PULL_REQUEST_BODY=Tributors update automated pull request." >> $GITHUB_ENV
- name: Open Pull Request
uses: vsoch/pull-request-action@1.0.15
uses: vsoch/pull-request-action@master
if: ${{ env.OPEN_PULL_REQUEST == '1' }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
exclude: "(.all-contributorsrc|static)"
exclude: "(.all-contributorsrc|.tributors|static)"
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
13 changes: 10 additions & 3 deletions .tributors
Original file line number Diff line number Diff line change
@@ -27,7 +27,8 @@
"name": "Sergio López Huguet",
"bio": "Ph.D Student ",
"blog": "https://github.com/serlophug",
"email": "sergio.lophug@gmail.com"
"email": "sergio.lophug@gmail.com",
"orcid": "0000-0002-6523-6108"
},
"jbd": {
"name": "jbd",
@@ -37,13 +38,15 @@
"alhirzel": {
"name": "Alex Hirzel",
"bio": "easygoing thinker/tinkerer type",
"blog": "http://alex.hirzel.us/"
"blog": "http://alex.hirzel.us/",
"email": "alex@hirzel.us"
},
"smoe": {
"name": "Steffen Möller",
"blog": "http://tangiblecomputationalbiology.blogspot.com",
"orcid": "0000-0002-7187-4683",
"email": "steffen_moeller@gmx.de"
"email": "steffen_moeller@gmx.de",
"bio": "Computational biologist in academia."
},
"yarikoptic": {
"name": "Yaroslav Halchenko",
@@ -116,5 +119,9 @@
"orcid": null,
"affiliation": "Fraunhofer-Institut für Zelltherapie und Immunologie",
"blog": "https://github.com/SethosII"
},
"karcaw": {
"name": "Evan Felix",
"blog": "https://github.com/karcaw"
}
}
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -12,6 +12,8 @@ represented by the pull requests that fixed them. Critical items to know are:


## [master](https://github.com/singularityhub/sregistry/tree/master) (master)
- remove button uploads, deprecated (2.1.2)
- setup LIST_DEFAULTS for list settings. (2.1.1)
- update to use Django 4.2 (2.1.0)
- consolidate config into one file with environment (2.0.0)
- This is an API breaking change, as the settings are completely refactored
Loading