Skip to content

Commit

Permalink
cloud,docker: switch back to sandybridge on docker and DO
Browse files Browse the repository at this point in the history
  • Loading branch information
lilith committed Jan 9, 2017
1 parent b02c745 commit 64aeef5
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -85,4 +85,4 @@ deploy:
condition: $UPLOAD_BUILD = True

after_success:
- if [[ "$FETCH_COMMIT_SUFFIX" == "linux64" ]]; then ./ci/travis_trigger_docker_cloud.sh; fi
- if [[ "$FETCH_COMMIT_SUFFIX" == "linux64_sandybridge_glibc223" ]]; then ./ci/travis_trigger_docker_cloud.sh; fi
2 changes: 1 addition & 1 deletion ci/cloud/mods/download_imageflow.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
mkdir nightly && cd nightly && wget -nv -O ifs.tar.gz https://s3-us-west-1.amazonaws.com/imageflow-nightlies/commits/7557de472008beec2bff8223626dbb566ee3e90d/linux64.tar.gz
mkdir nightly && cd nightly && wget -nv -O ifs.tar.gz https://s3-us-west-1.amazonaws.com/imageflow-nightlies/commits/b02c745686f4270742bdef388fe2d2560e8a2f0a/linux64_sandybridge_glibc223.tar.gz
tar xvzf ifs.tar.gz && mv ./imageflow_server ../ && cd .. && rm -rf nightly
4 changes: 2 additions & 2 deletions ci/cloud/mods/load_imageflow.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ set -e

"$( dirname "${BASH_SOURCE[0]}" )/validate_droplet.sh" "$@"

export IMAGEFLOW_COMMIT=7557de472008beec2bff8223626dbb566ee3e90d
export IMAGEFLOW_COMMIT=b02c745686f4270742bdef388fe2d2560e8a2f0a

ssh -oStrictHostKeyChecking=no "root@$(cat droplet.addr)" /bin/bash <<EOF1
mkdir nightly && cd nightly && wget -nv -O ifs.tar.gz https://s3-us-west-1.amazonaws.com/imageflow-nightlies/commits/${IMAGEFLOW_COMMIT}/linux64.tar.gz
mkdir nightly && cd nightly && wget -nv -O ifs.tar.gz https://s3-us-west-1.amazonaws.com/imageflow-nightlies/commits/${IMAGEFLOW_COMMIT}/linux64_sandybridge_glibc223.tar.gz
tar xvzf ifs.tar.gz && mv ./imageflow_server ../ && cd .. && rm -rf nightly
./imageflow_server --version
./imageflow_server diagnose --smoke-test-core
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/hub/nightly_unsecured/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ RUN if [ -z "${SOURCE_COMMIT}" ]; then echo "SOURCE_COMMIT not set; exiting" &&
if [[ "${SOURCE_COMMIT}" -ne "${BASE_OS_SOURCE_COMMIT}"]]; then echo "Mismatched images! ${BASE_OS_SOURCE_COMMIT} vs ${SOURCE_COMMIT}; exiting - push imazen/imageflow_base_os first" && exit 1; fi


RUN mkdir nightly && cd nightly && wget -nv -O ifs.tar.gz https://s3-us-west-1.amazonaws.com/imageflow-nightlies/commits/${SOURCE_COMMIT}/linux64.tar.gz \
RUN mkdir nightly && cd nightly && wget -nv -O ifs.tar.gz https://s3-us-west-1.amazonaws.com/imageflow-nightlies/commits/${SOURCE_COMMIT}/linux64_sandybridge_glibc223.tar.gz \
&& tar xvzf ifs.tar.gz && mv ./imageflow_server ../ && cd .. && rm -rf nightly

EXPOSE 39876
Expand Down
2 changes: 1 addition & 1 deletion ci/docker/hub/nightly_unsecured/README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

## imageflow_server_unsecured

No HTTPS support, no TLS, no NGINX proxy. Just imageflow_server, that's it.
No HTTPS support, no TLS, no NGINX proxy. Just imageflow_server, that's it. Compiled for Sandy Bridge and higher architectures

Starts the demo server by default on port 39876

Expand Down

0 comments on commit 64aeef5

Please sign in to comment.