-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2 from CLEAResult/ip-restrict-and-compose
Better container support for linux web apps
- Loading branch information
Showing
11 changed files
with
145 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,10 @@ | ||
[Unreleased] | ||
|
||
[v1.5.0] - 2020-01-13 | ||
|
||
Better container support for linux web apps | ||
|
||
- Variable descriptions clarify valid container and non-container values for `fx` | ||
- Setting the `fx` variable to `compose` or `kube` triggers base64 encode of `fx_version` variable | ||
- Set default value for storage_accounts variable | ||
- Add ip_restrictions support in site_config |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,41 @@ | ||
module "docker_appservice" { | ||
source = "../.." | ||
rg_name = basename(module.rg.id) | ||
rgid = var.rgid | ||
environment = var.environment | ||
location = var.location | ||
name_prefix = format("%s0", random_string.test.result) | ||
num = 1 | ||
slot_num = var.slot_num | ||
plan = azurerm_app_service_plan.linux.id | ||
subscription_id = var.subscription_id | ||
http2_enabled = var.http2_enabled | ||
key_vault_id = "" # azurerm_key_vault_secret.test.key_vault_id # see main.tf too | ||
secret_name = "" # var.secret_name | ||
fx = "docker" | ||
fx_version = "appsvcsample/python-helloworld:latest" | ||
ip_restrictions = var.ip_restrictions | ||
} | ||
|
||
module "compose_appservice" { | ||
source = "../.." | ||
rg_name = basename(module.rg.id) | ||
rgid = var.rgid | ||
environment = var.environment | ||
location = var.location | ||
name_prefix = format("%s1", random_string.test.result) | ||
num = 1 | ||
slot_num = var.slot_num | ||
plan = azurerm_app_service_plan.linux.id | ||
subscription_id = var.subscription_id | ||
http2_enabled = var.http2_enabled | ||
key_vault_id = "" # azurerm_key_vault_secret.test.key_vault_id # see main.tf too | ||
secret_name = "" # var.secret_name | ||
fx = "compose" | ||
fx_version = data.local_file.compose.content | ||
ip_restrictions = var.ip_restrictions | ||
} | ||
|
||
data "local_file" "compose" { | ||
filename = format("%s/docker-compose.yml", path.module) | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,28 @@ | ||
version: '3.3' | ||
|
||
services: | ||
db: | ||
image: mysql:5.7 | ||
volumes: | ||
- db_data:/var/lib/mysql | ||
restart: always | ||
environment: | ||
MYSQL_ROOT_PASSWORD: somewordpress | ||
MYSQL_DATABASE: wordpress | ||
MYSQL_USER: wordpress | ||
MYSQL_PASSWORD: wordpress | ||
|
||
wordpress: | ||
depends_on: | ||
- db | ||
image: wordpress:latest | ||
ports: | ||
- "8000:80" | ||
restart: always | ||
environment: | ||
WORDPRESS_DB_HOST: db:3306 | ||
WORDPRESS_DB_USER: wordpress | ||
WORDPRESS_DB_PASSWORD: wordpress | ||
WORDPRESS_DB_NAME: wordpress | ||
volumes: | ||
db_data: {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters