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

Master merged to trustrootsops #2657

Closed
wants to merge 91 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
54b7cfe
Update leaflet-active-area digest to f4300e2
renovate[bot] Sep 24, 2022
caf7eb2
Update dependency async to v2.6.4
renovate[bot] Sep 24, 2022
ff5f65a
Merge pull request #1 from trustrootsops/renovate/leaflet-active-area…
chmac Sep 24, 2022
29045cd
Merge pull request #2 from trustrootsops/renovate/async-2.x
chmac Sep 24, 2022
4eaa713
Update dependency classnames to v2.3.2
renovate[bot] Sep 24, 2022
f87f28a
Update dependency express-session to v1.17.3
renovate[bot] Sep 24, 2022
9bc39eb
Merge pull request #4 from trustrootsops/renovate/classnames-2.x
chmac Sep 24, 2022
44cbd76
Merge pull request #5 from trustrootsops/renovate/express-session-1.x
chmac Sep 24, 2022
0bddbcd
Automate docker build and tagging.
chmac Sep 24, 2022
80aeb72
Output the tag names.
chmac Sep 24, 2022
f76e295
Update readme.
chmac Sep 24, 2022
957d677
Merge branch 'docker-build-scripts'
chmac Sep 24, 2022
358d993
Add branch strategy to readme.
chmac Sep 24, 2022
fb9a747
More explicit push notice.
chmac Sep 24, 2022
38a9c1e
Update dependency glob to v7.2.3
renovate[bot] Sep 24, 2022
d670453
Update dependency gulp-load-plugins to v2.0.8
renovate[bot] Sep 24, 2022
8d3f065
Update dependency i18next-browser-languagedetector to v6.1.5
renovate[bot] Sep 24, 2022
51f2de3
Update dependency mapbox-gl to v1.13.2
renovate[bot] Sep 24, 2022
1d895d9
Update dependency moment to v2.29.4
renovate[bot] Sep 24, 2022
d410888
Update dependency mongoose to v5.13.15
renovate[bot] Sep 24, 2022
7f4a5a7
Update dependency nodemailer to v6.7.8
renovate[bot] Sep 25, 2022
bc89556
Update dependency react-map-gl to v5.3.19
renovate[bot] Sep 25, 2022
f26c5a7
Update dependency winston to v2.4.6
renovate[bot] Sep 25, 2022
87d6b1e
Update phusion/passenger-nodejs Docker tag to v2.3.1
renovate[bot] Sep 25, 2022
8314ae6
Merge pull request #6 from trustrootsops/renovate/glob-7.x
chmac Sep 28, 2022
342e4b5
Merge pull request #7 from trustrootsops/renovate/gulp-load-plugins-2.x
chmac Sep 28, 2022
884ecc2
Merge pull request #8 from trustrootsops/renovate/i18next-browser-lan…
chmac Sep 28, 2022
59207a8
Merge pull request #9 from trustrootsops/renovate/mapbox-gl-1.x
chmac Sep 28, 2022
4566110
Merge pull request #10 from trustrootsops/renovate/moment-2.x
chmac Sep 28, 2022
48cf461
Merge pull request #11 from trustrootsops/renovate/mongoose-5.x
chmac Sep 28, 2022
1f22776
Merge pull request #12 from trustrootsops/renovate/nodemailer-6.x
chmac Sep 28, 2022
576c2eb
Merge pull request #13 from trustrootsops/renovate/react-map-gl-5.x
chmac Sep 28, 2022
18b3cd3
Merge pull request #14 from trustrootsops/renovate/winston-2.x
chmac Sep 28, 2022
4de5f91
Merge pull request #15 from trustrootsops/renovate/phusion-passenger-…
chmac Sep 28, 2022
2733952
Merge remote-tracking branch 'origin/master'
chmac Sep 28, 2022
7f65037
Update dependency styled-components to v5.3.6
renovate[bot] Oct 1, 2022
67d51b8
Update sentry-javascript monorepo to v6.19.7
renovate[bot] Oct 1, 2022
3bc6b5a
Update dependency autolinker to v3.16.2
renovate[bot] Oct 1, 2022
fec2df3
Update dependency body-parser to v1.20.0
renovate[bot] Oct 1, 2022
d35dcdd
Update dependency del to v6.1.1
renovate[bot] Oct 1, 2022
e30d420
Update dependency express to v4.18.1
renovate[bot] Oct 1, 2022
f7fce22
Update dependency gm to v1.25.0
renovate[bot] Oct 1, 2022
bac3a4e
Update dependency html-to-text to v8.2.1
renovate[bot] Oct 1, 2022
102a14c
Merge pull request #16 from trustrootsops/renovate/styled-components-5.x
chmac Oct 3, 2022
d541073
Merge pull request #17 from trustrootsops/renovate/sentry-javascript-…
chmac Oct 3, 2022
e5a6d33
Merge pull request #18 from trustrootsops/renovate/autolinker-3.x
chmac Oct 3, 2022
e7cfe0f
Merge pull request #25 from trustrootsops/renovate/html-to-text-8.x
chmac Oct 3, 2022
b4ea072
Merge pull request #23 from trustrootsops/renovate/gm-1.x
chmac Oct 3, 2022
c49dba9
Merge pull request #22 from trustrootsops/renovate/express-4.x
chmac Oct 3, 2022
5174424
Merge pull request #21 from trustrootsops/renovate/del-6.x
chmac Oct 3, 2022
d94c8b1
Merge pull request #20 from trustrootsops/renovate/body-parser-1.x
chmac Oct 3, 2022
3c451eb
Update dependency axios to v0.27.2
renovate[bot] Oct 3, 2022
c012844
Merge pull request #19 from trustrootsops/renovate/axios-0.x
chmac Oct 3, 2022
39f5d1f
Update dependency helmet to v5.1.1
renovate[bot] Oct 3, 2022
86cdd05
Merge pull request #24 from trustrootsops/renovate/helmet-5.x
chmac Oct 3, 2022
99d2a85
Update dependency i18next to v20.6.1
renovate[bot] Oct 3, 2022
56f452c
Update dependency i18next-http-backend to v1.4.4
renovate[bot] Oct 3, 2022
640488f
Update dependency juice to v8.1.0
renovate[bot] Oct 3, 2022
4d99741
Update dependency natural to v5.2.3
renovate[bot] Oct 3, 2022
81dcf08
Merge pull request #32 from trustrootsops/renovate/natural-5.x
chmac Oct 3, 2022
ddf3fc2
Merge pull request #28 from trustrootsops/renovate/juice-8.x
chmac Oct 3, 2022
ac7b79a
Merge pull request #27 from trustrootsops/renovate/i18next-http-backe…
chmac Oct 3, 2022
ce69790
Merge pull request #26 from trustrootsops/renovate/i18next-20.x
chmac Oct 3, 2022
57f4089
Update dependency sanitize-html to v2.7.2
renovate[bot] Oct 3, 2022
69f1909
Update dependency wink-tokenizer to v5.3.0
renovate[bot] Oct 3, 2022
b6da111
Remove comment. Use npm build.
chmac Nov 4, 2022
b4e411f
Merge pull request #40 from trustrootsops/renovate/wink-tokenizer-5.x
chmac Nov 4, 2022
63d8343
Merge pull request #39 from trustrootsops/renovate/sanitize-html-2.x
chmac Nov 4, 2022
7936748
Remove email download.
chmac Nov 12, 2022
9d0dd87
Disable the search input box.
chmac Mar 10, 2023
5553e65
Stop if building fails.
chmac Mar 10, 2023
42fac23
Trying to put set in a new positon
chmac Mar 10, 2023
0937ac6
Switch to ghcr.io from docker hub.
chmac Mar 16, 2023
1784790
Update OffersPresentational.js
robokow Mar 21, 2023
13448b1
Update search-input.client.view.html
robokow Apr 1, 2023
e97f791
Merge branch 'master' of https://github.com/Trustroots/trustroots
robokow Apr 7, 2023
1a9185b
Replacing with original FAQ/Foundation docs
robokow Apr 7, 2023
044262d
Smaller edits
robokow Apr 7, 2023
924a399
Merge pull request #44 from trustrootsops/merge-docs-translations
robokow Apr 11, 2023
57b802d
Keep npm version < 8.
chmac Apr 13, 2023
bbcabc4
Quick and dirty spam check in signup fields.
chmac Apr 13, 2023
11f2852
Bugfix. It's includes not contains. DOH.
chmac Apr 13, 2023
aa9889c
Bugfix, mongo logic error.
chmac Apr 15, 2023
d1f4607
Merge branch 'master' of https://github.com/Trustroots/trustroots
robokow Apr 21, 2023
6a1f8e1
Merge branch 'master' of https://github.com/Trustroots/trustroots
robokow Apr 21, 2023
bf41085
Merge branch 'master' of https://github.com/Trustroots/trustroots
robokow Apr 26, 2023
89d99bf
Merge branch 'master' of https://github.com/Trustroots/trustroots
robokow Jun 6, 2023
6ff6049
Merge branch 'master' of https://github.com/Trustroots/trustroots
robokow Jun 6, 2023
10f794f
Merge branch 'master' of https://github.com/Trustroots/trustroots
robokow Sep 30, 2023
2136594
Merge branch 'master' of https://github.com/Trustroots/trustroots
robokow Oct 23, 2023
ec02df1
Merge branch 'master' of https://github.com/Trustroots/trustroots
mrkvon Jan 16, 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
Switch to ghcr.io from docker hub.
  • Loading branch information
chmac committed Mar 16, 2023
commit 0937ac68b6dd65c62e4cadf04316362c6e56d964
8 changes: 4 additions & 4 deletions deploy/docker/dockerBuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ cd ../..
set -e

if [ "$OS" = "Darwin" ]; then
docker build -f ./production.Dockerfile . -t trustrootsops/trustroots:latest -t "trustrootsops/trustroots:git-${COMMIT}"
docker build -f ./production.Dockerfile . -t ghcr.io/trustrootsops/trustroots:latest -t "ghcr.io/trustrootsops/trustroots:git-${COMMIT}"
else
sudo docker build -f ./production.Dockerfile . -t trustrootsops/trustroots:latest -t "trustrootsops/trustroots:git-${COMMIT}"
sudo docker build -f ./production.Dockerfile . -t ghcr.io/trustrootsops/trustroots:latest -t "ghcr.io/trustrootsops/trustroots:git-${COMMIT}"
fi

echo
echo "Docker images built."
echo
echo "Please push these images now like so:"
echo
echo "docker push trustrootsops/trustroots:git-${COMMIT}"
echo "docker push trustrootsops/trustroots:latest"
echo "docker push ghcr.io/trustrootsops/trustroots:git-${COMMIT}"
echo "docker push ghcr.io/trustrootsops/trustroots:latest"