override docker version deprecation

bluesky · Jul 3, 2024 · b35c0a6 · b35c0a6
1 parent f1a16f9
commit b35c0a6
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/scripts/docker.conf b/scripts/docker.conf
@@ -0,0 +1,2 @@
+[Service]
+Environment="DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE=1"
diff --git a/scripts/epics_docker.sh b/scripts/epics_docker.sh
@@ -3,6 +3,16 @@
 SCRIPTS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 source $SCRIPTS_DIR/epics_exports.sh
 
+
+# Override the deprecation warning of V1 images
+# Remove when images are updated
+sudo mkdir -p /etc/systemd/system/docker.service.d
+file="/etc/systemd/system/docker.service.d/http-proxy.conf"
+sudo cp $SCRIPTS_DIR/docker.conf $file
+sudo systemctl daemon-reload
+sudo systemctl restart docker
+
+
 MOTOR_DOCKERIMAGE="nsls2/epics-docker:latest"
 PE_DOCKERIMAGE="nsls2/pyepics-docker:latest"
 AD_DOCKERIMAGE="prjemian/synapps-6.1-ad-3.7:latest"
@@ -18,7 +28,7 @@ mkdir -p /tmp/ophyd_AD_test/
 # does not create missing directories.
 python $SCRIPTS_DIR/create_directories.py /tmp/ophyd_AD_test/data1
 
-docker run --rm -d -v /tmp/ophyd_AD_test:/tmp/ophyd_AD_test/ ${MOTOR_DOCKERIMAGE}
+docker --rm -d -v /tmp/ophyd_AD_test:/tmp/ophyd_AD_test/ ${MOTOR_DOCKERIMAGE}
 docker run --name=area-detector --rm -dit -v /tmp/ophyd_AD_test:/tmp/ophyd_AD_test/ -e AD_PREFIX="ADSIM:" ${AD_DOCKERIMAGE} /bin/bash
 sleep 1  # Probably not needed?
 docker exec area-detector iocSimDetector/simDetector.sh start
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		[Service]
		Environment="DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE=1"