Skip to content

Commit 8b9b521

Browse files
author
French Ben
committed
Fixed DDC versions and dynamic calls
Signed-off-by: French Ben <[email protected]>
1 parent d09c6fd commit 8b9b521

File tree

5 files changed

+35
-14
lines changed

5 files changed

+35
-14
lines changed

‎Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,13 @@ CHANNEL_CLOUD := alpha
88
DOCKER_EXPERIMENTAL := 1
99
VHD_SKU := docker4azure
1010
VHD_VERSION := 1.12.18
11-
CS_VHD_SKU := docker4azure-cs
11+
# stage offer will have the -preview
12+
OFFER_ID := docker4azure-preview
13+
VHD_VERSION := 1.12.15
14+
CS_VHD_SKU := docker4azure-cs-1_12
1215
CS_VHD_VERSION := 1.0.1
16+
# stage offer will have the -preview
17+
CS_OFFER_ID := docker4azure-cs-preview
1318
export
1419

1520
release: moby/alpine/cloud/aws/ami_id.out moby/alpine/cloud/azure/vhd_blob_url.out dockerimages

‎azure/release/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ build:
99
docker build -t azure-release .
1010

1111
template: clean build
12-
docker run -ti --rm -v $(PWD)/dist:/home/docker/dist/ azure-release --docker_version="$(EDITIONS_DOCKER_VERSION)" --edition_version="$(EDITIONS_VERSION)" --vhd_sku="$(VHD_SKU)" --vhd_version="$(VHD_VERSION)" --channel="$(CHANNEL)" --channel_cloud="$(CHANNEL_CLOUD)" --channel_ddc="$(CHANNEL_DDC)" --cs_vhd_sku="$(CS_VHD_SKU)" --cs_vhd_version="$(CS_VHD_VERSION)"
12+
docker run -ti --rm -v $(PWD)/dist:/home/docker/dist/ azure-release --docker_version="$(EDITIONS_DOCKER_VERSION)" --edition_version="$(EDITIONS_VERSION)" --vhd_sku="$(VHD_SKU)" --vhd_version="$(VHD_VERSION)" --channel="$(CHANNEL)" --channel_cloud="$(CHANNEL_CLOUD)" --channel_ddc="$(CHANNEL_DDC)" --cs_vhd_sku="$(CS_VHD_SKU)" --cs_vhd_version="$(CS_VHD_VERSION)" --cs_offer_id="$(CS_OFFER_ID)"
1313

1414
release: clean build
15-
docker run -ti --rm -v $(PWD)/dist:/home/docker/dist/ azure-release --upload --docker_version="$(EDITIONS_DOCKER_VERSION)" --edition_version="$(EDITIONS_VERSION)" --vhd_sku="$(VHD_SKU)" --vhd_version="$(VHD_VERSION)" --channel="$(CHANNEL)" --channel_cloud="$(CHANNEL_CLOUD)" --channel_ddc="$(CHANNEL_DDC)" --cs_vhd_sku="$(CS_VHD_SKU)" --cs_vhd_version="$(CS_VHD_VERSION)"
15+
docker run -ti --rm -v $(PWD)/dist:/home/docker/dist/ azure-release --upload --docker_version="$(EDITIONS_DOCKER_VERSION)" --edition_version="$(EDITIONS_VERSION)" --vhd_sku="$(VHD_SKU)" --vhd_version="$(VHD_VERSION)" --channel="$(CHANNEL)" --channel_cloud="$(CHANNEL_CLOUD)" --channel_ddc="$(CHANNEL_DDC)" --cs_vhd_sku="$(CS_VHD_SKU)" --cs_vhd_version="$(CS_VHD_VERSION)" --cs_offer_id="$(CS_OFFER_ID)"
1616

1717
clean:
1818
# rm -f tmp/*

‎azure/release/files/custom-data_manager_ddc.sh

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,24 @@ export TENANT_ID="variables('adServicePrincipalTenantID')"
1111
export DDC_USER="variables('ddcUser')"
1212
export DDC_PASS="variables('ddcPass')"
1313
export RGROUP_NAME="variables('groupName')";
14+
export SWARM_INFO_TABLE="variables('swarmInfoTable')"
15+
export SWARM_INFO_STORAGE_ACCOUNT="variables('swarmInfoStorageAccount')"
16+
export SWARM_LOGS_STORAGE_ACCOUNT="variables('swarmLogsStorageAccount')"
17+
export MANAGER_IP=$(ifconfig eth0 | grep "inet addr:" | cut -d: -f2 | cut -d" " -f1)
18+
# create daemon config with custom tag
19+
echo "{\"log-driver\": \"syslog\",\"log-opts\": {\"syslog-address\": \"udp://localhost:514\", \"tag\": \"{{.Name}}/{{.ID}}\" }}" > /etc/docker/daemon.json
20+
service docker restart
21+
sleep 5
1422

15-
23+
# add logging container
24+
docker volume create --name container-logs
25+
docker run --log-driver=json-file --name=editions_logger --restart=always -d -e ROLE="$ROLE" -e REGION="$REGION" -e TENANT_ID="$TENANT_ID" -e APP_ID="$APP_ID" -e APP_SECRET="$APP_SECRET" -e ACCOUNT_ID="$ACCOUNT_ID" -e GROUP_NAME="$GROUP_NAME" -e SWARM_LOGS_STORAGE_ACCOUNT="$SWARM_LOGS_STORAGE_ACCOUNT" -e SWARM_FILE_SHARE=`hostname` -p 514:514/udp -v container-logs:/log/ docker4x/logger-azure:"$DOCKER_FOR_IAAS_VERSION"
1626

17-
docker run --restart=no -d -e ROLE="$ROLE" -e REGION="$REGION" -e ACCOUNT_ID="$ACCOUNT_ID" -e PRIVATE_IP="$MANAGER_IP" -e DOCKER_FOR_IAAS_VERSION="$DOCKER_FOR_IAAS_VERSION" -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v /var/log:/var/log docker4x/init-azure:"$DOCKER_FOR_IAAS_VERSION"
18-
docker run --restart=always -d -e ROLE="$ROLE -e REGION="$REGION -e ACCOUNT_ID="$ACCOUNT_ID" -e PRIVATE_IP="$MANAGER_IP" -e DOCKER_FOR_IAAS_VERSION="$DOCKER_FOR_IAAS_VERSION" -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker docker4x/guide-azure:"$DOCKER_FOR_IAAS_VERSION"
27+
docker run --log-driver=json-file --restart=no -d -e ROLE="$ROLE" -e REGION="$REGION" -e TENANT_ID="$TENANT_ID" -e APP_ID="$APP_ID" -e APP_SECRET="$APP_SECRET" -e ACCOUNT_ID="$ACCOUNT_ID" -e GROUP_NAME="$GROUP_NAME" -e PRIVATE_IP="$MANAGER_IP" -e DOCKER_FOR_IAAS_VERSION="$DOCKER_FOR_IAAS_VERSION" -e SWARM_INFO_TABLE="$SWARM_INFO_TABLE" -e SWARM_INFO_STORAGE_ACCOUNT="$SWARM_INFO_STORAGE_ACCOUNT" -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v /var/log:/var/log docker4x/init-azure:"$DOCKER_FOR_IAAS_VERSION"
28+
docker run --log-driver=json-file --restart=always -d -e ROLE="$ROLE" -e REGION="$REGION" -e TENANT_ID="$TENANT_ID" -e APP_ID="$APP_ID" -e APP_SECRET="$APP_SECRET" -e ACCOUNT_ID="$ACCOUNT_ID" -e GROUP_NAME="$GROUP_NAME" -e PRIVATE_IP="$MANAGER_IP" -e DOCKER_FOR_IAAS_VERSION="$DOCKER_FOR_IAAS_VERSION" -e SWARM_INFO_TABLE="$SWARM_INFO_TABLE" -e SWARM_INFO_STORAGE_ACCOUNT="$SWARM_INFO_STORAGE_ACCOUNT" -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker -v /var/log:/var/log docker4x/guide-azure:"$DOCKER_FOR_IAAS_VERSION"
1929
echo default: "$LB_NAME" >> /var/lib/docker/swarm/elb.config
2030
echo "$LB_NAME" > /var/lib/docker/swarm/lb_name
21-
docker run -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker/swarm:/var/lib/docker/swarm --name=editions_controller docker4x/l4controller-azure:"$DOCKER_FOR_IAAS_VERSION" run --ad_app_id="$APP_ID" --ad_app_secret="$APP_SECRET" --subscription_id="$SUB_ID" --resource_group="$GROUP_NAME" --log=4 --default_lb_name="$LB_NAME" --environment=AzurePublicCloud
31+
docker run --log-driver=json-file -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker/swarm:/var/lib/docker/swarm --name=editions_controller docker4x/l4controller-azure:"$DOCKER_FOR_IAAS_VERSION" run --ad_app_id="$APP_ID" --ad_app_secret="$APP_SECRET" --subscription_id="$SUB_ID" --resource_group="$GROUP_NAME" --log=4 --default_lb_name="$LB_NAME" --environment=AzurePublicCloud
2232

2333

2434
docker run --restart=no --rm -e ROLE=$ROLE -e REGION=$REGION -e ACCOUNT_ID=$ACCOUNT_ID -e APP_ID=$APP_ID -e APP_SECRET=$APP_SECRET -e TENANT_ID=$TENANT_ID -e RGROUP_NAME=$RGROUP_NAME -e UCP_ADMIN_USER=$DDC_USER -e UCP_ADMIN_PASSWORD=$DDC_PASS -v /var/run/docker.sock:/var/run/docker.sock -v /usr/bin/docker:/usr/bin/docker docker4x/ddc-init-azure:$DOCKER_FOR_IAAS_VERSION

‎azure/release/files/release.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,18 @@ def main():
3030
parser.add_argument('--channel_ddc',
3131
dest='channel_ddc', default="alpha",
3232
help="DDC release channel (beta, alpha, rc, nightly)")
33+
parser.add_argument('--offer_id',
34+
dest='offer_id', default="docker4azure",
35+
help="The Azure VHD Offer ID")
3336
parser.add_argument('--cs_vhd_sku',
3437
dest='cs_vhd_sku',
3538
help="The Azure CS VHD SKU (i.e. docker4azure)")
3639
parser.add_argument('--cs_vhd_version',
3740
dest='cs_vhd_version',
3841
help="The Azure CS VHD version (i.e. 1.0.0)")
42+
parser.add_argument('--cs_offer_id',
43+
dest='cs_offer_id',
44+
help="The Azure CS VHD Offer ID")
3945
parser.add_argument("--upload", action="store_true",
4046
help="Upload the Azure template once generated")
4147

‎azure/release/files/utils.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -203,20 +203,20 @@ def create_rg_ddc_template(vhd_sku, vhd_version, release_channel, docker_version
203203
parameters = data.get('parameters')
204204
if parameters:
205205
new_parameters = {
206-
"DDCUsername": {
207-
"defaultValue": "admin",
208-
"type": "String",
209-
"metadata": {
210-
"description": "Please enter the username you want to use for Docker Datacenter."
211-
}
212-
},
213206
"DDCPassword": {
214207
"minLength": 8,
215208
"maxLength": 40,
216209
"type": "SecureString",
217210
"metadata": {
218211
"description": "Please enter the password you want to use for Docker Datacenter."
219212
}
213+
},
214+
"DDCUsername": {
215+
"defaultValue": "admin",
216+
"type": "String",
217+
"metadata": {
218+
"description": "Please enter the username you want to use for Docker Datacenter."
219+
}
220220
}
221221
}
222222
parameters.update(new_parameters)

0 commit comments

Comments
 (0)