Skip to content

Update docker base image #583

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

Merged
merged 9 commits into from
Apr 26, 2019
Merged

Update docker base image #583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ef119d9
Support Env vars and CMD in Pods
Apr 17, 2019
3955efc
Merge branch 'develop' of github.com:eclipse-iofog/Controller into de…
Apr 23, 2019
3ea858a
Dockerfiles
Apr 23, 2019
f24fbce
Add JRC and Attinad dev deployments
Apr 26, 2019
96aa520
Update docker base image
Apr 26, 2019
e41a72a
Merge branch 'develop' into saeid/engine-dev-pack
baghbidi Apr 26, 2019
a4c46e9
fix image tags
Apr 26, 2019
f38b70d
one more
Apr 26, 2019
9f27705
Change script to mutiline
Apr 26, 2019
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
95 changes: 49 additions & 46 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,36 +42,35 @@ jobs:
on:
branch: develop
after_deploy:
- sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP
"iofog-controller stop; rm -f /iofogcontroller/*"
- sshpass -p $DEV_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no iofogcontroller-*.tgz
$DEV_MACHINE_USERNAME@$DEV_MACHINE_IP:/iofogcontroller
- sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP
"npm i --unsafe-perm -g /iofogcontroller/iofogcontroller-*.tgz; iofog-controller start"

- sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP
"iofog-controller stop; rm -f /iofogcontroller/*"
- sshpass -p $JRC_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no iofogcontroller-*.tgz
$JRC_MACHINE_USERNAME@$JRC_MACHINE_IP:/iofogcontroller
- sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP
"npm i --unsafe-perm -g /iofogcontroller/iofogcontroller-*.tgz; iofog-controller start"
- sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP
"iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${JRC_MACHINE_PASSWORD}"

- sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP
"iofog-controller stop; rm -f /iofogcontroller/*"
- sshpass -p $ATTINAD_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no iofogcontroller-*.tgz
$ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP:/iofogcontroller
- sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP
"npm i --unsafe-perm -g /iofogcontroller/iofogcontroller-*.tgz; iofog-controller start"
- sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP
"iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${ATTINAD_MACHINE_PASSWORD}"

- docker build -t iofog/controller-develop:latest --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.dev
- echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
- docker push iofog/controller-develop:latest
- docker tag iofog/controller-develop:latest iofog/controller-develop:$COMMIT
- docker push iofog/controller-develop:$COMMIT
- |
export FILENAME=`ls iofogcontroller-*.tgz` &&
sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP \
"iofog-controller stop; rm -f /iofogcontroller*" &&
sshpass -p $DEV_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME \
$DEV_MACHINE_USERNAME@$DEV_MACHINE_IP:/$FILENAME &&
sshpass -p $DEV_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $DEV_MACHINE_USERNAME@$DEV_MACHINE_IP \
"npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" &&
sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
"iofog-controller stop; rm -f /iofogcontroller*" &&
sshpass -p $JRC_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME \
$JRC_MACHINE_USERNAME@$JRC_MACHINE_IP:/$FILENAME &&
sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
"npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" &&
sshpass -p $JRC_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $JRC_MACHINE_USERNAME@$JRC_MACHINE_IP \
"iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${JRC_MACHINE_PASSWORD}" &&
sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
"iofog-controller stop; rm -f /iofogcontroller*" &&
sshpass -p $ATTINAD_MACHINE_PASSWORD scp -o StrictHostKeyChecking=no $FILENAME \
$ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP:/$FILENAME &&
sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
"npm i --unsafe-perm -g /${FILENAME}; iofog-controller start" &&
sshpass -p $ATTINAD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $ATTINAD_MACHINE_USERNAME@$ATTINAD_MACHINE_IP \
"iofog-controller start; iofog-controller user add -f John -l Doe -e user@domain.com -p ${ATTINAD_MACHINE_PASSWORD}" &&
docker build -t iofog/controller-develop:latest --build-arg FILENAME=$FILENAME . -f Dockerfile.dev &&
echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin &&
docker push iofog/controller-develop:latest &&
docker tag iofog/controller-develop:latest iofog/controller-develop:$COMMIT &&
docker push iofog/controller-develop:$COMMIT
- stage: pre_release_deploy
before_install:
- sudo apt-get install sshpass
Expand All @@ -87,14 +86,16 @@ jobs:
on:
all_branches: true
after_deploy:
- sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP
"iofog-controller stop; npm i --unsafe-perm -g iofogcontroller@dev; iofog-controller start"
- export VERSION=`npm view iofogcontroller version`
- docker build -t iofog/controller:rc --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.rel
- echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
- docker push iofog/controller:rc
- docker tag iofog/controller:rc iofog/controller:rc-$VERSION
- docker push iofog/controller:rc-$VERSION
- |
sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP "iofog-controller stop" &&
sshpass -p $PREPROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PREPROD_MACHINE_USERNAME@$PREPROD_MACHINE_IP \
"npm i --unsafe-perm -g iofogcontroller@dev; iofog-controller start" &&
export VERSION=`npm view iofogcontroller version` &&
docker build -t iofog/controller:rc --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.rel &&
echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin &&
docker push iofog/controller:rc &&
docker tag iofog/controller:rc iofog/controller:rc-$VERSION &&
docker push iofog/controller:rc-$VERSION
- stage: release_deploy
before_install:
- sudo apt-get install sshpass
Expand All @@ -110,11 +111,13 @@ jobs:
on:
branch: master
after_deploy:
- sshpass -p $PROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PROD_MACHINE_USERNAME@$PROD_MACHINE_IP
"iofog-controller stop; npm update --unsafe-perm -g iofogcontroller; iofog-controller start"
- export VERSION=`npm view iofogcontroller version`
- docker build -t iofog/controller:latest --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.rel
- echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin
- docker push iofog/controller:latest
- docker tag iofog/controller:latest iofog/controller:$VERSION
- docker push iofog/controller:$VERSION
- |
sshpass -p $PROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PROD_MACHINE_USERNAME@$PROD_MACHINE_IP "iofog-controller stop" &&
sshpass -p $PROD_MACHINE_PASSWORD ssh -o StrictHostKeyChecking=no $PROD_MACHINE_USERNAME@$PROD_MACHINE_IP \
"npm update --unsafe-perm -g iofogcontroller; iofog-controller start" &&
export VERSION=`npm view iofogcontroller version` &&
docker build -t iofog/controller:latest --build-arg FILENAME=$(ls iofogcontroller-*.tgz) . -f Dockerfile.rel &&
echo "$DOCKER_PASS" | docker login -u "$DOCKER_USER" --password-stdin &&
docker push iofog/controller:latest &&
docker tag iofog/controller:latest iofog/controller:$VERSION &&
docker push iofog/controller:$VERSION
2 changes: 1 addition & 1 deletion Dockerfile.dev
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:alpine
FROM iofog/node:alpine

ARG FILENAME
ENV NODE_ENV=development
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile.rel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:alpine
FROM iofog/node:alpine

ARG FILENAME

Expand Down