Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .github/workflows/build-test-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,22 @@ on:

jobs:
build:
uses: notch8/actions/.github/workflows/[email protected].4
uses: notch8/actions/.github/workflows/[email protected].7
secrets: inherit
with:
platforms: "linux/amd64"
webTarget: hyku-web
workerTarget: hyku-worker

test:
needs: build
uses: notch8/actions/.github/workflows/[email protected].4
uses: notch8/actions/.github/workflows/[email protected].7
with:
confdir: '/app/samvera/hyrax-webapp/solr/conf'
rspec_cmd: "cd .. && gem install semaphore_test_boosters && bundle && rspec_booster --job $CI_NODE_INDEX/$CI_NODE_TOTAL"

lint:
needs: build
uses: notch8/actions/.github/workflows/[email protected].4
uses: notch8/actions/.github/workflows/[email protected].7
with:
webTarget: hyku-web
workerTarget: hyku-worker
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ on:

jobs:
deploy:
uses: notch8/actions/.github/workflows/[email protected].4
uses: notch8/actions/.github/workflows/[email protected].7
secrets: inherit
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/log/*.log
/pkg/
/tmp/
/store/
scratch.md
*~undo-tree~
.env.*
Expand Down
2 changes: 2 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@ FROM ghcr.io/samvera/hyrax/hyrax-base:$HYRAX_IMAGE_VERSION AS hyku-web

USER root
RUN git config --system --add safe.directory \*
ENV PATH="/app/samvera/bin:${PATH}"

USER app
ENV LD_PRELOAD=/usr/lib/libjemalloc.so.2
ENV MALLOC_CONF='dirty_decay_ms:1000,narenas:2,background_thread:true'
Expand Down
55 changes: 54 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ Below is an example of our Adventist Knapsack submodule.
[submodule "hyrax-webapp"]
path = hyrax-webapp
url = https://github.com/samvera/hyku.git
branch = adventist_dev
```

When you want to bring down an updated version of your Hyku submodule, use the following:
Expand Down Expand Up @@ -242,3 +241,57 @@ Contribution directions go here.
## License

The gem is available as open source under the terms of the [Apache 2.0](https://opensource.org/license/apache-2-0/).





# This is /run/systemd/resolve/stub-resolv.conf managed by man:systemd-resolved(8).
# Do not edit.
#
# This file might be symlinked as /etc/resolv.conf. If you're looking at
# /etc/resolv.conf and seeing this text, you have followed the symlink.
#
# This is a dynamic resolv.conf file for connecting local clients to the
# internal DNS stub resolver of systemd-resolved. This file lists all
# configured search domains.
#
# Run "resolvectl status" to see details about the uplink DNS servers
# currently in use.
#
# Third party programs should typically not access this file directly, but only
# through the symlink at /etc/resolv.conf. To manage man:resolv.conf(5) in a
# different way, replace this symlink by a static file or a different symlink.
#
# See man:systemd-resolved.service(8) for details about the supported modes of
# operation for /etc/resolv.conf.

nameserver 127.0.0.53
options edns0 trust-ad
search us-east-2.compute.internal


root@adl-staging01:~# cat /etc/resolv.conf
# This is /run/systemd/resolve/stub-resolv.conf managed by man:systemd-resolved(8).
# Do not edit.
#
# This file might be symlinked as /etc/resolv.conf. If you're looking at
# /etc/resolv.conf and seeing this text, you have followed the symlink.
#
# This is a dynamic resolv.conf file for connecting local clients to the
# internal DNS stub resolver of systemd-resolved. This file lists all
# configured search domains.
#
# Run "resolvectl status" to see details about the uplink DNS servers
# currently in use.
#
# Third party programs should typically not access this file directly, but only
# through the symlink at /etc/resolv.conf. To manage man:resolv.conf(5) in a
# different way, replace this symlink by a static file or a different symlink.
#
# See man:systemd-resolved.service(8) for details about the supported modes of
# operation for /etc/resolv.conf.

nameserver 127.0.0.53
options edns0 trust-ad
search .
5 changes: 0 additions & 5 deletions bin/bundle

This file was deleted.

158 changes: 0 additions & 158 deletions bin/csv_from_oai.rb

This file was deleted.

18 changes: 0 additions & 18 deletions bin/decrypt-secrets

This file was deleted.

31 changes: 0 additions & 31 deletions bin/encrypt-secrets

This file was deleted.

59 changes: 0 additions & 59 deletions bin/errors_from_spacestone.rb

This file was deleted.

Loading
Loading