Using new machines in circleci

engapa · engapa · commit 25b32d798aec · 2021-04-20T11:32:16.000+02:00
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -26,7 +26,7 @@ jobs:
 
   k8s:
     machine:
-      image: ubuntu-1604:201903-01
+      image: ubuntu-2004:202101-01
     steps:
       - checkout
       - run:
@@ -50,7 +50,7 @@ jobs:
 
   openshift:
     machine:
-      image: ubuntu-1604:201903-01
+      image: ubuntu-2004:202101-01
     steps:
     - checkout
     - run:
diff --git a/openshift/main.sh b/openshift/main.sh
@@ -26,7 +26,7 @@ function oc-cluster-run()
 {
 
   # Add internal insecure registry
-  sudo sed -i 's#^ExecStart=.*#ExecStart=/usr/bin/dockerd --insecure-registry='172.30.0.0/16' -H fd://#' /lib/systemd/system/docker.service
+  sudo sed -i 's#/usr/bin/dockerd#/usr/bin/dockerd --insecure-registry '172.30.0.0/16'#' /etc/systemd/system/docker.service.d/10-machine.conf
   sudo systemctl daemon-reload
   sudo systemctl restart docker
 

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ function oc-cluster-run()`
`26`	`26`	`{`
`27`	`27`
`28`	`28`	`# Add internal insecure registry`
`29`		`- sudo sed -i 's#^ExecStart=.*#ExecStart=/usr/bin/dockerd --insecure-registry='172.30.0.0/16' -H fd://#' /lib/systemd/system/docker.service`
	`29`	`+ sudo sed -i 's#/usr/bin/dockerd#/usr/bin/dockerd --insecure-registry '172.30.0.0/16'#' /etc/systemd/system/docker.service.d/10-machine.conf`
`30`	`30`	`sudo systemctl daemon-reload`
`31`	`31`	`sudo systemctl restart docker`
`32`	`32`