3dc52a3e by Adam Heath

No longer manage the registry via docker.

1 parent c0d7f766
...@@ -184,37 +184,10 @@ services: ...@@ -184,37 +184,10 @@ services:
184 "--with-node-id", 184 "--with-node-id",
185 ] 185 ]
186 186
187 registry:
188 image: registry:2
189 networks:
190 default:
191 aliases:
192 - ${REGISTRY_ID?Please set REGISTRY_ID}.registry
193 nginx:
194 ports:
195 - 443
196 volumes:
197 - registry:/var/lib/registry
198 - ./certs/registry.crt:/certs/registry.crt:ro
199 - ./certs/registry.key:/certs/registry.key:ro
200
201 environment:
202 - VIRTUAL_HOST=${REGISTRY_ID?Please set REGISTRY_ID}.registry
203 - VIRTUAL_PORT=443
204 - VIRTUAL_PROTO=https
205 - HTTPS_METHOD=noredirect
206 - CERT_NAME=default
207 - REGISTRY_HTTP_ADDR=0.0.0.0:443
208 - REGISTRY_HTTP_TLS_CERTIFICATE=/certs/registry.crt
209 - REGISTRY_HTTP_TLS_KEY=/certs/registry.key
210
211 volumes: 187 volumes:
212 etcd1-data: 188 etcd1-data:
213 etcd2-data: 189 etcd2-data:
214 etcd3-data: 190 etcd3-data:
215 server: {} 191 server: {}
216 output: {} 192 output: {}
217 registry:
218 external: true
219 name: ${REGISTRY_VOLUME_NAME?Please set REGISTRY_VOLUME_NAME}
220 193
......
...@@ -21,7 +21,6 @@ case "$1" in ...@@ -21,7 +21,6 @@ case "$1" in
21 esac 21 esac
22 22
23 "$TOP_DIR/scripts/ensure-certs.sh" 23 "$TOP_DIR/scripts/ensure-certs.sh"
24 docker-compose -f "$TOP_DIR/docker-compose.yaml" up -d registry
25 "$TOP_DIR/scripts/wait-for-etcd.sh" 24 "$TOP_DIR/scripts/wait-for-etcd.sh"
26 25
27 docker-compose -f "$TOP_DIR/docker-compose.yaml" up -d k3s-master-1 26 docker-compose -f "$TOP_DIR/docker-compose.yaml" up -d k3s-master-1
......