Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat/ui-docker-container-builds #7149

Open
wants to merge 27 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
435ca8e
adding basic docker container
gilesw Nov 29, 2024
5899a76
missing newrelic config
gilesw Nov 29, 2024
6e70747
json entrypoint recommendation
gilesw Nov 29, 2024
9e067ea
allow frontend to be configured separately to web
gilesw Nov 29, 2024
ecc70ca
add postgres, redis, haproxy lb containers for dev
gilesw Nov 29, 2024
184bf2d
Merge branch 'main' into feat/ui-docker-container-builds
amontenegro Dec 2, 2024
3c4e09a
Merge branch 'main' into feat/ui-docker-container-builds
amontenegro Dec 3, 2024
036c286
missing env files
gilesw Dec 4, 2024
c170a93
Merge branch 'feat/ui-docker-container-builds' of github.com:ORCID/OR…
gilesw Dec 4, 2024
58795ec
ro only perms as full write causes startup error
gilesw Dec 4, 2024
f8923a7
drop yaml markers in env files
gilesw Dec 5, 2024
d8dad88
feat: add haproxy router for database connections and use static ips …
gilesw Dec 5, 2024
b338281
Fix the code so the app can start with an empty identifer_type table
amontenegro Dec 5, 2024
4e27c0d
Merge branch 'feat/ui-docker-container-builds' of https://github.com/…
amontenegro Dec 5, 2024
97f89bc
Adding users
amontenegro Dec 5, 2024
a99373d
Client added
amontenegro Dec 5, 2024
5485d4d
migrating back to a defined bridged network
gilesw Dec 6, 2024
1ab8139
Merge branch 'feat/ui-docker-container-builds' of github.com:ORCID/OR…
gilesw Dec 6, 2024
991c872
adding orcid-haprouter to the builds
gilesw Dec 6, 2024
34085f5
adding in haprouter as default postgres connection
gilesw Dec 6, 2024
8ae0c47
cleaner overridable haprouter config
gilesw Dec 9, 2024
935a391
default.env is transfered via anisble not dev.env
gilesw Dec 9, 2024
4de984c
default.env is transfered via anisble not dev.env
gilesw Dec 9, 2024
37453e2
Update passphrase
amontenegro Dec 9, 2024
60a1eff
Merge branch 'feat/ui-docker-container-builds' of https://github.com/…
amontenegro Dec 9, 2024
7150de1
handle stale containers
gilesw Dec 30, 2024
50ae7f1
missing permissions and use env
gilesw Dec 30, 2024
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
Prev Previous commit
Next Next commit
json entrypoint recommendation
  • Loading branch information
gilesw committed Nov 29, 2024
commit 6e70747fcaa724344b9f8f17fc04a85b0a3dcb99
2 changes: 1 addition & 1 deletion orcid-web/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -96,5 +96,5 @@ COPY orcid-web/*.j2 .

COPY orcid-web/log4j2.xml .

ENTRYPOINT ./entrypoint.sh
ENTRYPOINT [ "./entrypoint.sh" ]