From d7d21d8a588fa984666b5e54788f2775e93c77c8 Mon Sep 17 00:00:00 2001 From: Benjamin Kiah Stroud <32469930+bkiahstroud@users.noreply.github.com> Date: Fri, 10 Jan 2025 17:27:40 -0800 Subject: [PATCH] replace softserv w/ n8 (config code) --- .github/workflows/build-test-lint.yaml | 6 +++--- .github/workflows/deploy.yaml | 2 +- Dockerfile | 2 +- docker-compose.yml | 10 +++++----- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build-test-lint.yaml b/.github/workflows/build-test-lint.yaml index 60893cbd7..1ffb7fcbd 100644 --- a/.github/workflows/build-test-lint.yaml +++ b/.github/workflows/build-test-lint.yaml @@ -17,7 +17,7 @@ on: jobs: build: - uses: scientist-softserv/actions/.github/workflows/build.yaml@v0.0.22 + uses: notch8/actions/.github/workflows/build.yaml@v0.0.22 secrets: inherit with: platforms: "linux/amd64" @@ -26,10 +26,10 @@ jobs: workerTarget: hyku-worker test: needs: build - uses: scientist-softserv/actions/.github/workflows/test.yaml@v0.0.22 + uses: notch8/actions/.github/workflows/test.yaml@v0.0.22 lint: needs: build - uses: scientist-softserv/actions/.github/workflows/lint.yaml@v0.0.22 + uses: notch8/actions/.github/workflows/lint.yaml@v0.0.22 with: rubocop_cmd: 'bundle exec rubocop --parallel --format progress' diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml index 45d31ca48..d5b63e5b3 100644 --- a/.github/workflows/deploy.yaml +++ b/.github/workflows/deploy.yaml @@ -20,5 +20,5 @@ on: jobs: deploy: - uses: scientist-softserv/actions/.github/workflows/deploy.yaml@v0.0.22 + uses: notch8/actions/.github/workflows/deploy.yaml@v0.0.22 secrets: inherit diff --git a/Dockerfile b/Dockerfile index 70a3429c1..b7033fec6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 " \ diff --git a/docker-compose.yml b/docker-compose.yml index d6140bf39..537cd1e26 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -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 @@ -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: @@ -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