Skip to content

Commit f52a95a

Browse files
sparaspara
authored
Merge pull request docker#159 from ManoMarks/master
Updating compose files to v3
2 parents 76edc22 + 2849e82 commit f52a95a

File tree

261 files changed

+9
-9
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

261 files changed

+9
-9
lines changed

‎12factor/05_build_release_run.md

+1-1

‎12factor/06_processes.md

+1-1

‎12factor/07_port_binding.md

+1-1

‎developer-tools/nodejs-debugging/VSCode-README.md

+1-1

‎developer-tools/nodejs/porting/4_single_host_networking.md

+2-2

‎developer-tools/nodejs/porting/6_deploy_on_swarm.md

+1-1

‎dockercon-us/README.md renamed to ‎dockercon-us-2016/README.md

‎dockercon-us/docker-cloud/README.md renamed to ‎dockercon-us-2016/docker-cloud/README.md

‎dockercon-us/docker-cloud/images/build_status.png renamed to ‎dockercon-us-2016/docker-cloud/images/build_status.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/building.png renamed to ‎dockercon-us-2016/docker-cloud/images/building.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/byon_button.png renamed to ‎dockercon-us-2016/docker-cloud/images/byon_button.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/byon_success.png renamed to ‎dockercon-us-2016/docker-cloud/images/byon_success.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/create-first-service.png renamed to ‎dockercon-us-2016/docker-cloud/images/create-first-service.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/edit_repo.png renamed to ‎dockercon-us-2016/docker-cloud/images/edit_repo.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/first-service-container-list.png renamed to ‎dockercon-us-2016/docker-cloud/images/first-service-container-list.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/first-service-container.png renamed to ‎dockercon-us-2016/docker-cloud/images/first-service-container.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/first-service-create-and-deploy-button.png renamed to ‎dockercon-us-2016/docker-cloud/images/first-service-create-and-deploy-button.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/first-service-ports.png renamed to ‎dockercon-us-2016/docker-cloud/images/first-service-ports.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/first-service-timeline.png renamed to ‎dockercon-us-2016/docker-cloud/images/first-service-timeline.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/first-service-webpage.png renamed to ‎dockercon-us-2016/docker-cloud/images/first-service-webpage.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/first-service-wizard.png renamed to ‎dockercon-us-2016/docker-cloud/images/first-service-wizard.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/first_node.png renamed to ‎dockercon-us-2016/docker-cloud/images/first_node.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/node-byoh-wizard-v2.png renamed to ‎dockercon-us-2016/docker-cloud/images/node-byoh-wizard-v2.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/port_8080.jpg renamed to ‎dockercon-us-2016/docker-cloud/images/port_8080.jpg

File renamed without changes.

‎dockercon-us/docker-cloud/images/power_socket.jpg renamed to ‎dockercon-us-2016/docker-cloud/images/power_socket.jpg

File renamed without changes.

‎dockercon-us/docker-cloud/images/repositories.png renamed to ‎dockercon-us-2016/docker-cloud/images/repositories.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/results.png renamed to ‎dockercon-us-2016/docker-cloud/images/results.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/service_deployed.png renamed to ‎dockercon-us-2016/docker-cloud/images/service_deployed.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/services_icon.png renamed to ‎dockercon-us-2016/docker-cloud/images/services_icon.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/stack_running.png renamed to ‎dockercon-us-2016/docker-cloud/images/stack_running.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/stacks_icon.png renamed to ‎dockercon-us-2016/docker-cloud/images/stacks_icon.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/timeline.png renamed to ‎dockercon-us-2016/docker-cloud/images/timeline.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/voting.png renamed to ‎dockercon-us-2016/docker-cloud/images/voting.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/welcome_node_create.png renamed to ‎dockercon-us-2016/docker-cloud/images/welcome_node_create.png

File renamed without changes.

‎dockercon-us/docker-cloud/images/wrench.jpg renamed to ‎dockercon-us-2016/docker-cloud/images/wrench.jpg

File renamed without changes.

‎dockercon-us/docker-cloud/images/wrench.png renamed to ‎dockercon-us-2016/docker-cloud/images/wrench.png

File renamed without changes.

‎dockercon-us/docker-datacenter/README.md renamed to ‎dockercon-us-2016/docker-datacenter/README.md

‎dockercon-us/docker-datacenter/images/IG_ucp02_t6_ActionDropdown.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/IG_ucp02_t6_ActionDropdown.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/IG_ucp02_t6_CreateNetwork.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/IG_ucp02_t6_CreateNetwork.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/IG_ucp02_t6_CreateNetworkButton.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/IG_ucp02_t6_CreateNetworkButton.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/IG_ucp02_t6_Networks.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/IG_ucp02_t6_Networks.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/IG_ucp02_t6_NetworksLink.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/IG_ucp02_t6_NetworksLink.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/IG_ucp02_t6_SelectApp.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/IG_ucp02_t6_SelectApp.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/IG_ucp02_t6_VoteAppBase.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/IG_ucp02_t6_VoteAppBase.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/IG_ucp02_t6_VoteResults.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/IG_ucp02_t6_VoteResults.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/IG_ucp02_t6_voting_cats_or_dogs.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/IG_ucp02_t6_voting_cats_or_dogs.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/account_details.png renamed to ‎dockercon-us-2016/docker-datacenter/images/account_details.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/add-pk.png renamed to ‎dockercon-us-2016/docker-datacenter/images/add-pk.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/add_label.png renamed to ‎dockercon-us-2016/docker-datacenter/images/add_label.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/add_permission.png renamed to ‎dockercon-us-2016/docker-datacenter/images/add_permission.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/add_user_to_team.png renamed to ‎dockercon-us-2016/docker-datacenter/images/add_user_to_team.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/app-architecture.jpg renamed to ‎dockercon-us-2016/docker-datacenter/images/app-architecture.jpg

File renamed without changes.

‎dockercon-us/docker-datacenter/images/architecture-1.png renamed to ‎dockercon-us-2016/docker-datacenter/images/architecture-1.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/architecture-2.png renamed to ‎dockercon-us-2016/docker-datacenter/images/architecture-2.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/architecture-3.png renamed to ‎dockercon-us-2016/docker-datacenter/images/architecture-3.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/architecture-4.png renamed to ‎dockercon-us-2016/docker-datacenter/images/architecture-4.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/basic_settings.png renamed to ‎dockercon-us-2016/docker-datacenter/images/basic_settings.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/browser_cert_open.png renamed to ‎dockercon-us-2016/docker-datacenter/images/browser_cert_open.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/browser_cert_san.png renamed to ‎dockercon-us-2016/docker-datacenter/images/browser_cert_san.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/cli-based-access-1.png renamed to ‎dockercon-us-2016/docker-datacenter/images/cli-based-access-1.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/cluster-nodes.png renamed to ‎dockercon-us-2016/docker-datacenter/images/cluster-nodes.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/container-detail-2.png renamed to ‎dockercon-us-2016/docker-datacenter/images/container-detail-2.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/container-list.png renamed to ‎dockercon-us-2016/docker-datacenter/images/container-list.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/container_console_link.png renamed to ‎dockercon-us-2016/docker-datacenter/images/container_console_link.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/container_detail.png renamed to ‎dockercon-us-2016/docker-datacenter/images/container_detail.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/container_edit.png renamed to ‎dockercon-us-2016/docker-datacenter/images/container_edit.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/controller-containers.png renamed to ‎dockercon-us-2016/docker-datacenter/images/controller-containers.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/create_network.png renamed to ‎dockercon-us-2016/docker-datacenter/images/create_network.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/create_team.png renamed to ‎dockercon-us-2016/docker-datacenter/images/create_team.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/create_user.png renamed to ‎dockercon-us-2016/docker-datacenter/images/create_user.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/dashboard.png renamed to ‎dockercon-us-2016/docker-datacenter/images/dashboard.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/deploy-app-ui-1.png renamed to ‎dockercon-us-2016/docker-datacenter/images/deploy-app-ui-1.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/deploy-app-ui-2.png renamed to ‎dockercon-us-2016/docker-datacenter/images/deploy-app-ui-2.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/deploy-app-ui-3.png renamed to ‎dockercon-us-2016/docker-datacenter/images/deploy-app-ui-3.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/deploy-app-ui-4.png renamed to ‎dockercon-us-2016/docker-datacenter/images/deploy-app-ui-4.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/deploy-app-ui-5.png renamed to ‎dockercon-us-2016/docker-datacenter/images/deploy-app-ui-5.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/deploy-app-ui-6.png renamed to ‎dockercon-us-2016/docker-datacenter/images/deploy-app-ui-6.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/deploy_container.png renamed to ‎dockercon-us-2016/docker-datacenter/images/deploy_container.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/deploy_view_error.png renamed to ‎dockercon-us-2016/docker-datacenter/images/deploy_view_error.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/deployed_container.png renamed to ‎dockercon-us-2016/docker-datacenter/images/deployed_container.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/display_container.png renamed to ‎dockercon-us-2016/docker-datacenter/images/display_container.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/docker-hub-license.png renamed to ‎dockercon-us-2016/docker-datacenter/images/docker-hub-license.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/docker-hub-settings.png renamed to ‎dockercon-us-2016/docker-datacenter/images/docker-hub-settings.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/dtr-integration-1.png renamed to ‎dockercon-us-2016/docker-datacenter/images/dtr-integration-1.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/dtr-integration-2.png renamed to ‎dockercon-us-2016/docker-datacenter/images/dtr-integration-2.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/dtr-integration-3.png renamed to ‎dockercon-us-2016/docker-datacenter/images/dtr-integration-3.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/dtr-integration-4.png renamed to ‎dockercon-us-2016/docker-datacenter/images/dtr-integration-4.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/dtr-integration-5.png renamed to ‎dockercon-us-2016/docker-datacenter/images/dtr-integration-5.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/explain.gliffy renamed to ‎dockercon-us-2016/docker-datacenter/images/explain.gliffy

File renamed without changes.

‎dockercon-us/docker-datacenter/images/explain.png renamed to ‎dockercon-us-2016/docker-datacenter/images/explain.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ft_node.jpg renamed to ‎dockercon-us-2016/docker-datacenter/images/ft_node.jpg

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ft_port.jpg renamed to ‎dockercon-us-2016/docker-datacenter/images/ft_port.jpg

File renamed without changes.

‎dockercon-us/docker-datacenter/images/get-license.png renamed to ‎dockercon-us-2016/docker-datacenter/images/get-license.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/go_networks.png renamed to ‎dockercon-us-2016/docker-datacenter/images/go_networks.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/hello_world_pull.png renamed to ‎dockercon-us-2016/docker-datacenter/images/hello_world_pull.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/host_ip_address.png renamed to ‎dockercon-us-2016/docker-datacenter/images/host_ip_address.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ip_cloud_provider.png renamed to ‎dockercon-us-2016/docker-datacenter/images/ip_cloud_provider.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/john_full_details.png renamed to ‎dockercon-us-2016/docker-datacenter/images/john_full_details.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ldap_access.png renamed to ‎dockercon-us-2016/docker-datacenter/images/ldap_access.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/license-title.png renamed to ‎dockercon-us-2016/docker-datacenter/images/license-title.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/license-ucp-1.png renamed to ‎dockercon-us-2016/docker-datacenter/images/license-ucp-1.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/license-ucp-2.png renamed to ‎dockercon-us-2016/docker-datacenter/images/license-ucp-2.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/license.jpg renamed to ‎dockercon-us-2016/docker-datacenter/images/license.jpg

File renamed without changes.

‎dockercon-us/docker-datacenter/images/license.png renamed to ‎dockercon-us-2016/docker-datacenter/images/license.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/login-ani.gif renamed to ‎dockercon-us-2016/docker-datacenter/images/login-ani.gif

File renamed without changes.

‎dockercon-us/docker-datacenter/images/login.png renamed to ‎dockercon-us-2016/docker-datacenter/images/login.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/match_list.png renamed to ‎dockercon-us-2016/docker-datacenter/images/match_list.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/monitor-ucp-1.png renamed to ‎dockercon-us-2016/docker-datacenter/images/monitor-ucp-1.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/monitor-ucp-2.png renamed to ‎dockercon-us-2016/docker-datacenter/images/monitor-ucp-2.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/multiple-replicas.png renamed to ‎dockercon-us-2016/docker-datacenter/images/multiple-replicas.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/my_new_site.png renamed to ‎dockercon-us-2016/docker-datacenter/images/my_new_site.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/network_gui_error.png renamed to ‎dockercon-us-2016/docker-datacenter/images/network_gui_error.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/nginx.jpg renamed to ‎dockercon-us-2016/docker-datacenter/images/nginx.jpg

File renamed without changes.

‎dockercon-us/docker-datacenter/images/nginx_deploy_details.png renamed to ‎dockercon-us-2016/docker-datacenter/images/nginx_deploy_details.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/nginx_welcome.png renamed to ‎dockercon-us-2016/docker-datacenter/images/nginx_welcome.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/node.jpg renamed to ‎dockercon-us-2016/docker-datacenter/images/node.jpg

File renamed without changes.

‎dockercon-us/docker-datacenter/images/node_information.png renamed to ‎dockercon-us-2016/docker-datacenter/images/node_information.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/nodes-3.png renamed to ‎dockercon-us-2016/docker-datacenter/images/nodes-3.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/nodes-page.png renamed to ‎dockercon-us-2016/docker-datacenter/images/nodes-page.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/nodes.jpg renamed to ‎dockercon-us-2016/docker-datacenter/images/nodes.jpg

File renamed without changes.

‎dockercon-us/docker-datacenter/images/nodes.png renamed to ‎dockercon-us-2016/docker-datacenter/images/nodes.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/orca_components.png renamed to ‎dockercon-us-2016/docker-datacenter/images/orca_components.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/overview-1.png renamed to ‎dockercon-us-2016/docker-datacenter/images/overview-1.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/overview-2.png renamed to ‎dockercon-us-2016/docker-datacenter/images/overview-2.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/overview-3.png renamed to ‎dockercon-us-2016/docker-datacenter/images/overview-3.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/port_80.png renamed to ‎dockercon-us-2016/docker-datacenter/images/port_80.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/port_config.png renamed to ‎dockercon-us-2016/docker-datacenter/images/port_config.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/port_mappings.png renamed to ‎dockercon-us-2016/docker-datacenter/images/port_mappings.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/port_mappings_check.png renamed to ‎dockercon-us-2016/docker-datacenter/images/port_mappings_check.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/replica-nodes.png renamed to ‎dockercon-us-2016/docker-datacenter/images/replica-nodes.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/sandbox.gliffy renamed to ‎dockercon-us-2016/docker-datacenter/images/sandbox.gliffy

File renamed without changes.

‎dockercon-us/docker-datacenter/images/sandbox.png renamed to ‎dockercon-us-2016/docker-datacenter/images/sandbox.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/save_team.png renamed to ‎dockercon-us-2016/docker-datacenter/images/save_team.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/second_node.png renamed to ‎dockercon-us-2016/docker-datacenter/images/second_node.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/settings-log.png renamed to ‎dockercon-us-2016/docker-datacenter/images/settings-log.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/skip-this.png renamed to ‎dockercon-us-2016/docker-datacenter/images/skip-this.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/skip.jpg renamed to ‎dockercon-us-2016/docker-datacenter/images/skip.jpg

File renamed without changes.

‎dockercon-us/docker-datacenter/images/stop_error.png renamed to ‎dockercon-us-2016/docker-datacenter/images/stop_error.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/troubleshoot-ucp-1.png renamed to ‎dockercon-us-2016/docker-datacenter/images/troubleshoot-ucp-1.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ub2_deploy.png renamed to ‎dockercon-us-2016/docker-datacenter/images/ub2_deploy.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ubuntu_deploy.png renamed to ‎dockercon-us-2016/docker-datacenter/images/ubuntu_deploy.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp02_t2_container_details_node.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp02_t2_container_details_node.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp02_t2_containers.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp02_t2_containers.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp02_t2_containers_withhighlight.png renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp02_t2_containers_withhighlight.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp02_t2_networksettings.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp02_t2_networksettings.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp02_t2_nginx_welcome.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp02_t2_nginx_welcome.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp02_t2_portmappings.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp02_t2_portmappings.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp02_t4_applications.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp02_t4_applications.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp02_t4_applications_expanded.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp02_t4_applications_expanded.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp02_t4_applications_remove.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp02_t4_applications_remove.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp02_t4_client_bundle.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp02_t4_client_bundle.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp02_t4_foodtrucks.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp02_t4_foodtrucks.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp02_t4_helloredis.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp02_t4_helloredis.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp02_t4_profile_dropdown.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp02_t4_profile_dropdown.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp02_t5_compose_application.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp02_t5_compose_application.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp02_t5_create_application_output.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp02_t5_create_application_output.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp02_t5_create_application_screen.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp02_t5_create_application_screen.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp03_t1_add_label.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp03_t1_add_label.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp03_t1_add_user_to_team.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp03_t1_add_user_to_team.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp03_t1_create_label.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp03_t1_create_label.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp03_t1_create_team.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp03_t1_create_team.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp03_t1_create_user.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp03_t1_create_user.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp03_t1_create_user_dialog.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp03_t1_create_user_dialog.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp03_t1_permissions.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp03_t1_permissions.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp03_t1_permissions_label.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp03_t1_permissions_label.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp03_t1_select_team.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp03_t1_select_team.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp03_t1_users_and_teams.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp03_t1_users_and_teams.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp03_t2_bash.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp03_t2_bash.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp03_t2_container_tabs.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp03_t2_container_tabs.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp03_t2_labels.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp03_t2_labels.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp03_t4_AllUsers.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp03_t4_AllUsers.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp03_t4_LDAP.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp03_t4_LDAP.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp03_t4_LDAP_user_search.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp03_t4_LDAP_user_search.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp03_t4_startTLS.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp03_t4_startTLS.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/ucp03_t5_ChangePW.PNG renamed to ‎dockercon-us-2016/docker-datacenter/images/ucp03_t5_ChangePW.PNG

File renamed without changes.

‎dockercon-us/docker-datacenter/images/users_teams.png renamed to ‎dockercon-us-2016/docker-datacenter/images/users_teams.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/view_label.png renamed to ‎dockercon-us-2016/docker-datacenter/images/view_label.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/vote-app-test.jpg renamed to ‎dockercon-us-2016/docker-datacenter/images/vote-app-test.jpg

File renamed without changes.

‎dockercon-us/docker-datacenter/images/votingapp-net.png renamed to ‎dockercon-us-2016/docker-datacenter/images/votingapp-net.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/votingapp_default.png renamed to ‎dockercon-us-2016/docker-datacenter/images/votingapp_default.png

File renamed without changes.

‎dockercon-us/docker-datacenter/images/welcome_nginx.png renamed to ‎dockercon-us-2016/docker-datacenter/images/welcome_nginx.png

File renamed without changes.

‎dockercon-us/docker-developer/README.MD renamed to ‎dockercon-us-2016/docker-developer/README.MD

‎dockercon-us/docker-developer/images/About16.png renamed to ‎dockercon-us-2016/docker-developer/images/About16.png

File renamed without changes.

‎dockercon-us/docker-developer/images/Config-popup.png renamed to ‎dockercon-us-2016/docker-developer/images/Config-popup.png

File renamed without changes.

‎dockercon-us/docker-developer/images/Docker-win-settings.png renamed to ‎dockercon-us-2016/docker-developer/images/Docker-win-settings.png

File renamed without changes.

‎dockercon-us/docker-developer/images/Start-Authorize.png renamed to ‎dockercon-us-2016/docker-developer/images/Start-Authorize.png

File renamed without changes.

‎dockercon-us/docker-developer/images/Start-init.png renamed to ‎dockercon-us-2016/docker-developer/images/Start-init.png

File renamed without changes.

‎dockercon-us/docker-developer/images/about-docker-win.png renamed to ‎dockercon-us-2016/docker-developer/images/about-docker-win.png

File renamed without changes.

‎dockercon-us/docker-developer/images/changelog-placeholder.png renamed to ‎dockercon-us-2016/docker-developer/images/changelog-placeholder.png

File renamed without changes.

‎dockercon-us/docker-developer/images/config-popup-menu-win.png renamed to ‎dockercon-us-2016/docker-developer/images/config-popup-menu-win.png

File renamed without changes.

‎dockercon-us/docker-developer/images/console_logs.png renamed to ‎dockercon-us-2016/docker-developer/images/console_logs.png

File renamed without changes.

‎dockercon-us/docker-developer/images/console_logs_search.png renamed to ‎dockercon-us-2016/docker-developer/images/console_logs_search.png

File renamed without changes.

‎dockercon-us/docker-developer/images/desktop-whale-icon.png renamed to ‎dockercon-us-2016/docker-developer/images/desktop-whale-icon.png

File renamed without changes.

‎dockercon-us/docker-developer/images/diagnose-feedback-id-win.png renamed to ‎dockercon-us-2016/docker-developer/images/diagnose-feedback-id-win.png

File renamed without changes.

‎dockercon-us/docker-developer/images/diagnose-feedback-win.png renamed to ‎dockercon-us-2016/docker-developer/images/diagnose-feedback-win.png

File renamed without changes.

‎dockercon-us/docker-developer/images/diagnose-id-forums.png renamed to ‎dockercon-us-2016/docker-developer/images/diagnose-id-forums.png

File renamed without changes.

‎dockercon-us/docker-developer/images/diagnose.png renamed to ‎dockercon-us-2016/docker-developer/images/diagnose.png

File renamed without changes.

‎dockercon-us/docker-developer/images/docker-app-drag-old.png renamed to ‎dockercon-us-2016/docker-developer/images/docker-app-drag-old.png

File renamed without changes.

‎dockercon-us/docker-developer/images/docker-app-drag.png renamed to ‎dockercon-us-2016/docker-developer/images/docker-app-drag.png

File renamed without changes.

‎dockercon-us/docker-developer/images/docker-app-in-apps.png renamed to ‎dockercon-us-2016/docker-developer/images/docker-app-in-apps.png

File renamed without changes.

‎dockercon-us/docker-developer/images/docker-app-log.png renamed to ‎dockercon-us-2016/docker-developer/images/docker-app-log.png

File renamed without changes.

‎dockercon-us/docker-developer/images/docker-app.png renamed to ‎dockercon-us-2016/docker-developer/images/docker-app.png

File renamed without changes.

‎dockercon-us/docker-developer/images/docker-daemon.png renamed to ‎dockercon-us-2016/docker-developer/images/docker-daemon.png

File renamed without changes.

‎dockercon-us/docker-developer/images/docker-for-mac-and-toolbox.png renamed to ‎dockercon-us-2016/docker-developer/images/docker-for-mac-and-toolbox.png

File renamed without changes.

‎dockercon-us/docker-developer/images/docker-for-mac-install.png renamed to ‎dockercon-us-2016/docker-developer/images/docker-for-mac-install.png

File renamed without changes.

‎dockercon-us/docker-developer/images/docker-is-running.png renamed to ‎dockercon-us-2016/docker-developer/images/docker-is-running.png

File renamed without changes.

‎dockercon-us/docker-developer/images/download.png renamed to ‎dockercon-us-2016/docker-developer/images/download.png

File renamed without changes.

‎dockercon-us/docker-developer/images/hello-world-nginx.png renamed to ‎dockercon-us-2016/docker-developer/images/hello-world-nginx.png

File renamed without changes.

‎dockercon-us/docker-developer/images/hello-world.png renamed to ‎dockercon-us-2016/docker-developer/images/hello-world.png

File renamed without changes.

‎dockercon-us/docker-developer/images/hockeyapp-docker.png renamed to ‎dockercon-us-2016/docker-developer/images/hockeyapp-docker.png

File renamed without changes.

‎dockercon-us/docker-developer/images/hyper-v-message.png renamed to ‎dockercon-us-2016/docker-developer/images/hyper-v-message.png

File renamed without changes.

‎dockercon-us/docker-developer/images/image1.png renamed to ‎dockercon-us-2016/docker-developer/images/image1.png

File renamed without changes.

‎dockercon-us/docker-developer/images/image2.png renamed to ‎dockercon-us-2016/docker-developer/images/image2.png

File renamed without changes.

‎dockercon-us/docker-developer/images/image4.png renamed to ‎dockercon-us-2016/docker-developer/images/image4.png

File renamed without changes.

‎dockercon-us/docker-developer/images/import-docker-content.png renamed to ‎dockercon-us-2016/docker-developer/images/import-docker-content.png

File renamed without changes.

‎dockercon-us/docker-developer/images/installer-allow.png renamed to ‎dockercon-us-2016/docker-developer/images/installer-allow.png

File renamed without changes.

‎dockercon-us/docker-developer/images/installer-finishes.png renamed to ‎dockercon-us-2016/docker-developer/images/installer-finishes.png

File renamed without changes.

‎dockercon-us/docker-developer/images/installer-in-downloads.png renamed to ‎dockercon-us-2016/docker-developer/images/installer-in-downloads.png

File renamed without changes.

‎dockercon-us/docker-developer/images/installer-license-ok.png renamed to ‎dockercon-us-2016/docker-developer/images/installer-license-ok.png

File renamed without changes.

‎dockercon-us/docker-developer/images/installer-license-show.png renamed to ‎dockercon-us-2016/docker-developer/images/installer-license-show.png

File renamed without changes.

‎dockercon-us/docker-developer/images/installer-progress-bar.png renamed to ‎dockercon-us-2016/docker-developer/images/installer-progress-bar.png

File renamed without changes.

‎dockercon-us/docker-developer/images/log-files-finder.png renamed to ‎dockercon-us-2016/docker-developer/images/log-files-finder.png

File renamed without changes.

‎dockercon-us/docker-developer/images/logs.png renamed to ‎dockercon-us-2016/docker-developer/images/logs.png

File renamed without changes.

‎dockercon-us/docker-developer/images/mac-activity-monitor-docker-app.png renamed to ‎dockercon-us-2016/docker-developer/images/mac-activity-monitor-docker-app.png

File renamed without changes.

‎dockercon-us/docker-developer/images/mac-install-success-docker-ps.png renamed to ‎dockercon-us-2016/docker-developer/images/mac-install-success-docker-ps.png

File renamed without changes.

‎dockercon-us/docker-developer/images/menu.png renamed to ‎dockercon-us-2016/docker-developer/images/menu.png

File renamed without changes.

‎dockercon-us/docker-developer/images/proxy-settings.png renamed to ‎dockercon-us-2016/docker-developer/images/proxy-settings.png

File renamed without changes.

‎dockercon-us/docker-developer/images/remove-app-instances.png renamed to ‎dockercon-us-2016/docker-developer/images/remove-app-instances.png

File renamed without changes.

‎dockercon-us/docker-developer/images/run-nginx.png renamed to ‎dockercon-us-2016/docker-developer/images/run-nginx.png

File renamed without changes.

‎dockercon-us/docker-developer/images/settings-advanced.png renamed to ‎dockercon-us-2016/docker-developer/images/settings-advanced.png

File renamed without changes.

‎dockercon-us/docker-developer/images/settings-cpu-ram.png renamed to ‎dockercon-us-2016/docker-developer/images/settings-cpu-ram.png

File renamed without changes.

‎dockercon-us/docker-developer/images/settings-docker-win.png renamed to ‎dockercon-us-2016/docker-developer/images/settings-docker-win.png

File renamed without changes.

‎dockercon-us/docker-developer/images/settings-general.png renamed to ‎dockercon-us-2016/docker-developer/images/settings-general.png

File renamed without changes.

‎dockercon-us/docker-developer/images/settings-kernel.png renamed to ‎dockercon-us-2016/docker-developer/images/settings-kernel.png

File renamed without changes.

‎dockercon-us/docker-developer/images/settings-network.png renamed to ‎dockercon-us-2016/docker-developer/images/settings-network.png

File renamed without changes.

‎dockercon-us/docker-developer/images/settings-reset.png renamed to ‎dockercon-us-2016/docker-developer/images/settings-reset.png

File renamed without changes.

‎dockercon-us/docker-developer/images/settings-shared-drives.png renamed to ‎dockercon-us-2016/docker-developer/images/settings-shared-drives.png

File renamed without changes.

‎dockercon-us/docker-developer/images/settings-toolbox-import.png renamed to ‎dockercon-us-2016/docker-developer/images/settings-toolbox-import.png

File renamed without changes.

‎dockercon-us/docker-developer/images/settings-uninstall.png renamed to ‎dockercon-us-2016/docker-developer/images/settings-uninstall.png

File renamed without changes.

‎dockercon-us/docker-developer/images/settings.png renamed to ‎dockercon-us-2016/docker-developer/images/settings.png

File renamed without changes.

‎dockercon-us/docker-developer/images/startup-help.png renamed to ‎dockercon-us-2016/docker-developer/images/startup-help.png

File renamed without changes.

‎dockercon-us/docker-developer/images/submit-token.png renamed to ‎dockercon-us-2016/docker-developer/images/submit-token.png

File renamed without changes.

‎dockercon-us/docker-developer/images/toolbox-install.png renamed to ‎dockercon-us-2016/docker-developer/images/toolbox-install.png

File renamed without changes.

‎dockercon-us/docker-developer/images/whale-in-menu-bar.png renamed to ‎dockercon-us-2016/docker-developer/images/whale-in-menu-bar.png

File renamed without changes.

‎dockercon-us/docker-developer/images/whale-systray.png renamed to ‎dockercon-us-2016/docker-developer/images/whale-systray.png

File renamed without changes.

‎dockercon-us/docker-developer/images/whale-x.png renamed to ‎dockercon-us-2016/docker-developer/images/whale-x.png

File renamed without changes.

‎dockercon-us/docker-developer/images/whale.png renamed to ‎dockercon-us-2016/docker-developer/images/whale.png

File renamed without changes.

‎dockercon-us/docker-developer/images/win-file-and-printer-sharing.png renamed to ‎dockercon-us-2016/docker-developer/images/win-file-and-printer-sharing.png

File renamed without changes.

‎dockercon-us/docker-developer/images/win-install-success-hello-world.png renamed to ‎dockercon-us-2016/docker-developer/images/win-install-success-hello-world.png

File renamed without changes.

‎dockercon-us/docker-developer/images/win-install-success.png renamed to ‎dockercon-us-2016/docker-developer/images/win-install-success.png

File renamed without changes.

‎dockercon-us/docker-orchestration/Dockerfile renamed to ‎dockercon-us-2016/docker-orchestration/Dockerfile

File renamed without changes.

‎dockercon-us/docker-orchestration/README.md renamed to ‎dockercon-us-2016/docker-orchestration/README.md

‎dockercon-us/docker-orchestration/app.py renamed to ‎dockercon-us-2016/docker-orchestration/app.py

File renamed without changes.

‎dockercon-us/docker-orchestration/images/browser.png renamed to ‎dockercon-us-2016/docker-orchestration/images/browser.png

File renamed without changes.

‎dockercon-us/docker-orchestration/images/cat.png renamed to ‎dockercon-us-2016/docker-orchestration/images/cat.png

File renamed without changes.

‎dockercon-us/docker-orchestration/images/food.png renamed to ‎dockercon-us-2016/docker-orchestration/images/food.png

File renamed without changes.

‎dockercon-us/docker-orchestration/images/hub.png renamed to ‎dockercon-us-2016/docker-orchestration/images/hub.png

File renamed without changes.

‎dockercon-us/docker-orchestration/templates/index.html renamed to ‎dockercon-us-2016/docker-orchestration/templates/index.html

File renamed without changes.

‎dockercon-us/images/dockercon.png renamed to ‎dockercon-us-2016/images/dockercon.png

File renamed without changes.

‎windows/aspnet-web/docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
version: "2"
1+
version: "3"
22

33
services:
44

‎windows/windows-containers/MultiContainerApp.md

+1-1

0 commit comments

Comments
 (0)