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.

Sign up for GitHub

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

Jump to bottom

Update cmr1 package versions #2

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update cmr1 package versions #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e524a5
Update cmr1 package versions
5290charlie Jul 3, 2018
164ffba
Fix build
5290charlie Jul 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion .dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
.git
.git
node_modules
certs
6 changes: 3 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@ services:
env:
global:
- APP_ENV=test
- DOMAIN=travis.test.aws.cmr1.com
- DOMAIN=ci.test.aws.cmr1.com
- secure: WQRVBDV1HyE2nIc411NOioVM2WBL7207vKdBudeW1+82Q4LoDbVKIqaCIKev1GCr8c5qb7nQ84S2g+/nufl0AD4BlGEJvZ8BhslMG7zQaXnyN9ohH0ltuz2PyKmGFO8sUaGuscLO1jHKIyYIykoTd/fgM3P7s7EWZ3tlrK6PpmtHVQBi7Pu8UA2ePac+vQqS2WIB5rcHkRzYYp1UciBt0FUsNBs4vY4UYcx7+JjRDko7Y3GBR5mEww2anuLFTCRZKzOGQV+RUSblVXNbyN7f5KiL3faUVdR2IUKeLOq0H/xL/jHBmInbo0DALP1/ttvMNtKnJOViFWgEKgo5/2nrYvZ3GHkbJjJqTif6KApdgD7KCiq7hV3HzyV/XauQ4S1tCk0mkhoepO9rBk1xHbfKmeKgDW6P8xqnkmkAND5t4RnSPAFX8i2sFyDuHehKPOTJ4AbPlpZcUTbFEEJNWk7i3wkG9ec1r0+DTpRkXiagKa2wBpzsYbxcQGjPTPXP18F6Bj1Co60+bk/vx2exF6ZXIQenUupcXPCZzkc5dp5hWFLI+z+X50e54DkGEqsfx9BN0oyK4PhPvM8ZN7+S0ntGR0ENxEusauo4Y3OqGq0KZTbRjE2t5F44wl963FaWcb7dtFt8DoKgyx+yaJLiDhIdk4WKlQLOIVxb0k5C8qG9nso=
- secure: nwflAZn6Bdhf6NKyq12v3cL9f3ojoXc8TnkGsFD7/UAbXZ+D8di5ylqvb8esbTYxMKLg5YuEcsWwZy7EH8cy7ZswfBFMAHVJMD/6PM2XHF9JiMEsFwAs4OLF4VKHqvpsghpM45ifSmDAz4wauimOvKloRzM6zpA3n6GBqE0/YdUUku0t71Fnfl+GP2L03dfBOoXrl8oEHHXDsC3KN1fjkIhlxqRoyvjC8xlFDCAmqTfaZiwLiZeaVAKjU9VOGwp4tSXR6wXd8OsXZeB+eZvsE3eoONhXxXx6T3nPI+u8p0vDyBsLbfG2xyvA0x1A9rjMAOvaIrnz+yVEGs0nIf4ma4KAf/w+DF73jZs/BZ4uV4uQSg5Zxkf3HabE3u+Qc2vePIVbN7MczIMtQ+KU7hT93LCtgraVqd1ZJVYt+CeG4qn84zZ0Myg1U0I1kAd2ME+Lj0Gnp5LovEL41zkSFH5IJukpS8u2/5jPfIDtNKyQ0CtFa14hhAuOJprwDgHGTQfHnjE8fTLMXayJfYvC3Yq0muHP6V4vcPeUEDRUbtt3S4NO8VOvhAq77NLe2FlaIdEZiVSV4JJe5AL26tJLv55ZLq11GDp2BDjxYhEkA4qAOFBb349eILy9ddr+bglYWN54UPLshKRbzV7VNoMpsEOF/BpBhgWZIL7SgrknSEfg2zc=
- secure: KHlJfCbxejaLbcPMfLoOb8u8cXHvCgYPGiHjc7kinAoV7N5vQDPSN13p7uyuGp7sZhwwMmh6I+NDEMDJqnGwJ3RcgALePNzcd4S+Yw/Qy9OGX9vOOoHgORCcbOaNtTG5MBSpjIgFFgIEl7J4JWc9mEvLs/qa64twr4GKq8tmCVlC2mzG9I+Xb/A1eTQZP2ckXnyumPso75i0CiDkVneuaPXmJn0Yg1n6yPzgNIOkUn640g4znyg1N2ZveC41du4mjhdbjAqDrIz5t2PVnXNXer9wgaW1NKq0+tEnx1clpjPzTI+0RxmEiVIBuBEkWIHg3R4A5eTd32vLuSe2eIngibmlGKYou9SN0Vtn4gTwTyvmSlC9eh2yIMiz2vLfuksGDZrPmlAgQGhOuD1QR+TQxx6urE1Q89eI4CuK+n6eYUpwJK0kRyjHNfdxTAKrDXcZVny+xyb0h1U8THVoGD5bMcNCakod7QKRM/LCRzI0O/tXRjl1mI2UgY9fYkCm4uENF/Sy8QPCbiM0rxcAVoTZdLZqh1S4usc9gjpDbO/j2QlMhcX9Jzj6u3nuFIpVV5garYN/sBsxEhQbJKJ1URe5nQPUTYvTA94wd9h37q5U8YSmVx+WuAqzX+h43rZY/1OkZIOe8bRKdI/vjn+pZoxT1578LFvHe8g2DZS7w25BZ4U=
- secure: S+TqcvbPcIW/aJCBc3mfWyitIGldcWPYHFEePYB1J0ZK92hHdZxmhxf8hqr0osVxXoUfvJc+afFBRY5F1cE1gnRrBNs9LpSkndjygYG+tbFvy0Ecc98TvC4Mo7hyzCT9QSlpFVVg2Ww9kHRTUC7UR2Ey52kRTt5jFv9Gf3xwgeKdB2wM0+RPNzd6XQHMt/p2lOcWGcGc3oHqXbjbFH48c2OtRh/KPElCkM2thob4Y1Eli7DpYrQ3zK44vh478MdH5Q7O/7AnYdiRCAxXOYEE7wv5Oq+3S5Fn+9UStmd0z/mVLF33GHId0h48+ExcJ0U6eUP0tUursxNxzW0lELzqnxNI8RaY7VyCim6zybW4rAEhyT/iNSMiUgBhPTtSI6wd4mwDJMCO4tt9BWq3yPBCbgiwsYmlmWYgedDw+dYl84PsDHf6jj3K1vE92VWrJuAIIHoee6tEenGbKBFj3hSUh22ctEecYDa0pmK9u0OTFEPayHgukmgM4vpm83fBzsAbL4Zn0fiZEX1IWr1lvjzwIc6B+5j/2I2qBBXXDLJxVBc22t4GVPIX+e8GcTFDwpFCieWOQCbytvLDXXeCz6uzAXoTNSOVNdVNSwDSVz7F9FZ6s37vtlvjpBJSegTsuUTrSFEOl9Fk/diJYq4GMatuyDtdELBikhRP01jV+hvQ42U=
before_install:
- docker build -t cmr1/sslr .
script:
- docker run -v certs:/etc/dehydrated/certs -e APP_ENV -e DOMAINS=$DOMAIN -e AWS_ACCESS_KEY_ID
-e AWS_SECRET_ACCESS_KEY cmr1/sslr
- docker run -v $(pwd)/certs:/etc/dehydrated/certs -e APP_ENV -e DOMAINS=$DOMAIN -e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY cmr1/sslr
- ./test.sh
after_success:
- ./deploy.sh
notifications:
Expand Down
2 changes: 1 addition & 1 deletion config/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module.exports = {
output_acm: process.env.OUTPUT_ACM || '',
dehydrated_path: process.env.DEHYDRATED_PATH || '/etc/dehydrated',
challenge_webroot: process.env.CHALLENGE_WEBROOT || '/var/www/acme',
challenge_type: process.env.CHALLENGE_TYPE || AVAILABLE_CHALLENGES[0],
challenge_type: process.env.CHALLENGETYPE || AVAILABLE_CHALLENGES[0],
constants: {
ROOT_PATH,
CHALLENGE_HTTP,
Expand Down
11 changes: 9 additions & 2 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
version: '2'
version: '3.5'

services:
sslr:
build: .
volumes:
- ./certs:/etc/dehydrated/certs
- type: volume
source: nodemodules
target: /sslr/node_modules
volume:
nocopy: true
env_file:
- .sslr.env


volumes:
nodemodules:
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
"homepage": "",
"dependencies": {
"cmr1-aws": "^0.2.3",
"cmr1-cli": "^0.1.6",
"cmr1-logger": "0.0.3",
"cmr1-cli": "^0.1.11",
"cmr1-logger": "0.1.4",
"fs-extra": "^2.0.0"
}
}