Skip to content

Commit

Permalink
replace softserv w/ n8 (config code)
Browse files Browse the repository at this point in the history
  • Loading branch information
bkiahstroud committed Jan 11, 2025
1 parent 02d448e commit d7d21d8
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-test-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:

jobs:
build:
uses: scientist-softserv/actions/.github/workflows/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
secrets: inherit
with:
platforms: "linux/amd64"
Expand All @@ -26,10 +26,10 @@ jobs:
workerTarget: hyku-worker
test:
needs: build
uses: scientist-softserv/actions/.github/workflows/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
lint:
needs: build
uses: scientist-softserv/actions/.github/workflows/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
with:
rubocop_cmd: 'bundle exec rubocop --parallel --format progress'

2 changes: 1 addition & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,5 @@ on:

jobs:
deploy:
uses: scientist-softserv/actions/.github/workflows/[email protected]
uses: notch8/actions/.github/workflows/[email protected]
secrets: inherit
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN wget -O - https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemal
make && \
make install

FROM ghcr.io/scientist-softserv/dev-ops/samvera:f71b284f as hyku-base
FROM ghcr.io/notch8/dev-ops/samvera:f71b284f as hyku-base

COPY --chown=1001:101 $APP_PATH/Gemfile* /app/samvera/hyrax-webapp/
RUN sh -l -c " \
Expand Down
10 changes: 5 additions & 5 deletions docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ x-app: &app
args:
- EXTRA_APK_PACKAGES=less vim bash openjdk11-jre ffmpeg rsync exiftool
- HYKU_BULKRAX_ENABLED=true
image: ghcr.io/scientist-softserv/palni-palci:${TAG:-latest}
image: ghcr.io/notch8/palni-palci:${TAG:-latest}
env_file:
- .env
# NOTE: all common env variables moved to .env
Expand All @@ -29,9 +29,9 @@ x-app-worker: &app-worker
- EXTRA_APK_PACKAGES=less vim bash openjdk11-jre ffmpeg rsync exiftool
- HYKU_BULKRAX_ENABLED=true
cache_from:
- ghcr.io/scientist-softserv/palni-palci:latest
- ghcr.io/scientist-softserv/palni-palci/worker:latest
image: ghcr.io/scientist-softserv/palni-palci/worker:${TAG:-latest}
- ghcr.io/notch8/palni-palci:latest
- ghcr.io/notch8/palni-palci/worker:latest
image: ghcr.io/notch8/palni-palci/worker:${TAG:-latest}
command: sh -l -c 'bundle && bundle exec sidekiq'
depends_on:
check_volumes:
Expand Down Expand Up @@ -85,7 +85,7 @@ services:
timeout: "8s"

solr:
image: ghcr.io/scientist-softserv/palni-palci/solr:${TAG:-latest}
image: ghcr.io/notch8/palni-palci/solr:${TAG:-latest}
build:
context: solr
dockerfile: Dockerfile
Expand Down

0 comments on commit d7d21d8

Please sign in to comment.