From 7a100d08d46b030f46c73a3c261940dfa94616bb Mon Sep 17 00:00:00 2001 From: Ludovico Magnocavallo Date: Wed, 17 Jun 2020 05:41:13 +0200 Subject: [PATCH] Move top-level docker images folder to the onprem module (#96) * move docker folder to the onprme module * update CHANGELOG --- CHANGELOG.md | 3 ++- modules/cloud-config-container/onprem/README.md | 4 ++-- .../onprem/docker-images/README.md | 3 +++ .../onprem/docker-images}/strongswan/Dockerfile | 0 .../onprem/docker-images}/strongswan/README.md | 14 +++++++------- .../docker-images}/strongswan/cloudbuild.yaml | 0 .../onprem/docker-images}/strongswan/entrypoint.sh | 0 .../onprem/docker-images}/strongswan/ipsec-vti.sh | 0 .../onprem/docker-images}/toolbox/Dockerfile | 0 .../onprem/docker-images}/toolbox/README.md | 2 +- .../onprem/docker-images}/toolbox/cloudbuild.yaml | 0 .../onprem/docker-images}/toolbox/entrypoint.sh | 0 12 files changed, 15 insertions(+), 11 deletions(-) create mode 100644 modules/cloud-config-container/onprem/docker-images/README.md rename {docker-images => modules/cloud-config-container/onprem/docker-images}/strongswan/Dockerfile (100%) rename {docker-images => modules/cloud-config-container/onprem/docker-images}/strongswan/README.md (88%) rename {docker-images => modules/cloud-config-container/onprem/docker-images}/strongswan/cloudbuild.yaml (100%) rename {docker-images => modules/cloud-config-container/onprem/docker-images}/strongswan/entrypoint.sh (100%) rename {docker-images => modules/cloud-config-container/onprem/docker-images}/strongswan/ipsec-vti.sh (100%) rename {docker-images => modules/cloud-config-container/onprem/docker-images}/toolbox/Dockerfile (100%) rename {docker-images => modules/cloud-config-container/onprem/docker-images}/toolbox/README.md (97%) rename {docker-images => modules/cloud-config-container/onprem/docker-images}/toolbox/cloudbuild.yaml (100%) rename {docker-images => modules/cloud-config-container/onprem/docker-images}/toolbox/entrypoint.sh (100%) diff --git a/CHANGELOG.md b/CHANGELOG.md index 14b376234..ebaed3dec 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,11 @@ All notable changes to this project will be documented in this file. ## [Unreleased] - **incompatible change** routes in the `net-vpc` module now interpolate the VPC name to ensure uniqueness, upgrading from a previous version will drop and recreate routes +- the top-level `docker-images` folder has been moved inside `modules/cloud-config-container/onprem` ## [2.0.0] - 2020-06-11 -- new `data-solutions` section and `cmek-via-centralized-kms` example +- new `data-solutions` section and `cmek-via-centralized-kms` example - **incompatible change** static VPN routes now interpolate the VPN gateway name to enforce uniqueness, upgrading from a previous version will drop and recreate routes ## [1.9.0] - 2020-06-10 diff --git a/modules/cloud-config-container/onprem/README.md b/modules/cloud-config-container/onprem/README.md index 260aad1bb..a4a6c9abb 100644 --- a/modules/cloud-config-container/onprem/README.md +++ b/modules/cloud-config-container/onprem/README.md @@ -4,11 +4,11 @@ This module manages a `cloud-config` configuration that starts an emulated on-pr The emulated on-premises infrastructure is composed of: -- a Strongswan container managing the VPN tunnel to GCP +- a [Strongswan container](./docker-images/strongswan) managing the VPN tunnel to GCP - an optional Bird container managing the BGP session - a CoreDNS container servng local DNS and forwarding to GCP - an Nginx container serving a simple static web page -- a generic Linux container used as a jump host inside the on-premises network +- a [generic Linux container](./docker-images/toolbox) used as a jump host inside the on-premises network A [complete scenario using this module](../../../infrastructure/onprem-google-access-dns) is available in the infrastructure examples. diff --git a/modules/cloud-config-container/onprem/docker-images/README.md b/modules/cloud-config-container/onprem/docker-images/README.md new file mode 100644 index 000000000..e9342f7e7 --- /dev/null +++ b/modules/cloud-config-container/onprem/docker-images/README.md @@ -0,0 +1,3 @@ +# Supporting container images + +The images in this folder are used by the [`onprem` module](../). \ No newline at end of file diff --git a/docker-images/strongswan/Dockerfile b/modules/cloud-config-container/onprem/docker-images/strongswan/Dockerfile similarity index 100% rename from docker-images/strongswan/Dockerfile rename to modules/cloud-config-container/onprem/docker-images/strongswan/Dockerfile diff --git a/docker-images/strongswan/README.md b/modules/cloud-config-container/onprem/docker-images/strongswan/README.md similarity index 88% rename from docker-images/strongswan/README.md rename to modules/cloud-config-container/onprem/docker-images/strongswan/README.md index 42225416b..cc6eca12d 100644 --- a/docker-images/strongswan/README.md +++ b/modules/cloud-config-container/onprem/docker-images/strongswan/README.md @@ -1,9 +1,14 @@ # StrongSwan docker container -### [strongSwan](https://www.strongswan.org/) is an OpenSource IPsec-based VPN Solution +## Build + +```bash +gcloud builds submit . --config=cloudbuild.yaml +``` + +## Docker compose example -### Docker compose example ```yaml version: "3" services: @@ -37,8 +42,3 @@ services: - "/var/lib/docker-compose/onprem/bird/bird.conf:/etc/bird/bird.conf:ro" ``` - -### Build -```bash -gcloud builds submit . --config=cloudbuild.yaml -``` diff --git a/docker-images/strongswan/cloudbuild.yaml b/modules/cloud-config-container/onprem/docker-images/strongswan/cloudbuild.yaml similarity index 100% rename from docker-images/strongswan/cloudbuild.yaml rename to modules/cloud-config-container/onprem/docker-images/strongswan/cloudbuild.yaml diff --git a/docker-images/strongswan/entrypoint.sh b/modules/cloud-config-container/onprem/docker-images/strongswan/entrypoint.sh similarity index 100% rename from docker-images/strongswan/entrypoint.sh rename to modules/cloud-config-container/onprem/docker-images/strongswan/entrypoint.sh diff --git a/docker-images/strongswan/ipsec-vti.sh b/modules/cloud-config-container/onprem/docker-images/strongswan/ipsec-vti.sh similarity index 100% rename from docker-images/strongswan/ipsec-vti.sh rename to modules/cloud-config-container/onprem/docker-images/strongswan/ipsec-vti.sh diff --git a/docker-images/toolbox/Dockerfile b/modules/cloud-config-container/onprem/docker-images/toolbox/Dockerfile similarity index 100% rename from docker-images/toolbox/Dockerfile rename to modules/cloud-config-container/onprem/docker-images/toolbox/Dockerfile diff --git a/docker-images/toolbox/README.md b/modules/cloud-config-container/onprem/docker-images/toolbox/README.md similarity index 97% rename from docker-images/toolbox/README.md rename to modules/cloud-config-container/onprem/docker-images/toolbox/README.md index 6e2f70c24..6daada8fb 100644 --- a/docker-images/toolbox/README.md +++ b/modules/cloud-config-container/onprem/docker-images/toolbox/README.md @@ -3,7 +3,7 @@ Lightweight container with some basic console tools used for testing and probing. -## Building +## Build ```bash gcloud builds submit . --config=cloudbuild.yaml diff --git a/docker-images/toolbox/cloudbuild.yaml b/modules/cloud-config-container/onprem/docker-images/toolbox/cloudbuild.yaml similarity index 100% rename from docker-images/toolbox/cloudbuild.yaml rename to modules/cloud-config-container/onprem/docker-images/toolbox/cloudbuild.yaml diff --git a/docker-images/toolbox/entrypoint.sh b/modules/cloud-config-container/onprem/docker-images/toolbox/entrypoint.sh similarity index 100% rename from docker-images/toolbox/entrypoint.sh rename to modules/cloud-config-container/onprem/docker-images/toolbox/entrypoint.sh