Skip to content
This repository was archived by the owner on Dec 5, 2023. It is now read-only.

Commit 624a459

Browse files
Merge pull request #59 from microservices-demo/bug/socks-to-sock
Socks to Sock
2 parents 697080b + 4904eaa commit 624a459

File tree

11 files changed

+33
-33
lines changed

11 files changed

+33
-33
lines changed

404.html

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77

8-
<title>Microservices Demo: Socks Shop</title>
8+
<title>Microservices Demo: Sock Shop</title>
99

1010
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
1111
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
@@ -23,7 +23,7 @@
2323

2424
<div class="container">
2525
<div class="header clearfix">
26-
<div class="header-home"><a href="/">Socks Shop</a></div>
26+
<div class="header-home"><a href="/">Sock Shop</a></div>
2727
<nav>
2828
<ul class="nav header-nav">
2929
<li class=""><a href="/docs/quickstart.html">Quickstart</a></li>
@@ -54,13 +54,13 @@ <h2>Socks Not Found</h2>
5454
<div class="col-sm-6">
5555
<h3>Open Source &amp; Free</h3>
5656
<p>
57-
Socks Shop is <a href="http://github.com/microservices-demo" target="_blank">open source</a>, (<a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>) and is free to use for talks, testing and demo's.
57+
Sock Shop is <a href="http://github.com/microservices-demo" target="_blank">open source</a>, (<a href="https://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0</a>) and is free to use for talks, testing and demo's.
5858
</p>
5959
</div>
6060
<div class="col-sm-6">
61-
<h3>Socks Shop on Slack</h3>
61+
<h3>Sock Shop on Slack</h3>
6262
<p>
63-
The Weave Community hosts the Socks Shop Slack channel.
63+
The Weave Community hosts the Sock Shop Slack channel.
6464
<a href="https://weaveworks.github.io/community-slack/" target="_blank">Join Slack</a> and tell us how you're using the app.
6565
</p>
6666
</div>

_includes/header.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<div class="header clearfix">
2-
<div class="header-home"><a href="{{site.main_url_prefix}}/">Socks Shop</a></div>
2+
<div class="header-home"><a href="{{site.main_url_prefix}}/">Sock Shop</a></div>
33
<nav>
44
<ul class="nav header-nav">
55
<li class="{% if include.quickstart %}active{% endif %}"><a href="/docs/quickstart.html">Quickstart</a></li>

_layouts/api.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77

8-
<title>Microservices Demo: Socks Shop</title>
8+
<title>Microservices Demo: Sock Shop</title>
99

1010
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
1111
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">

_layouts/default.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77

8-
<title>Microservices Demo: Socks Shop</title>
8+
<title>Microservices Demo: Sock Shop</title>
99

1010
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
1111
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">

_layouts/quickstart.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<meta http-equiv="X-UA-Compatible" content="IE=edge">
66
<meta name="viewport" content="width=device-width, initial-scale=1">
77

8-
<title>Microservices Demo: Socks Shop</title>
8+
<title>Microservices Demo: Sock Shop</title>
99

1010
<link href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
1111
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">

deployment/apcera.md

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ layout: default
33
deployDoc: true
44
---
55

6-
## Socks Shop on Apcera
6+
## Sock Shop on Apcera
77

8-
These instructions will help you deploy and run the Socks Shop application on the [Apcera Platform](https://www.apcera.com/platform), an enterprise-grade container management platform for cloud-native and legacy applications. Apcera is secure by default, only permitting things explicitly authorized by policy, and supports multi-cloud deployments.
8+
These instructions will help you deploy and run the Sock Shop application on the [Apcera Platform](https://www.apcera.com/platform), an enterprise-grade container management platform for cloud-native and legacy applications. Apcera is secure by default, only permitting things explicitly authorized by policy, and supports multi-cloud deployments.
99

10-
Apcera has tested Socks Shop on the Apcera Community Edition running single-cloud clusters in Amazon AWS, Google Cloud Platform, Microsoft Azure, and VMware. We have also tested Socks Shop on the Apcera Enterprise Edition running a multi-cloud cluster that spanned across AWS, GCP, and VMware.
10+
Apcera has tested Sock Shop on the Apcera Community Edition running single-cloud clusters in Amazon AWS, Google Cloud Platform, Microsoft Azure, and VMware. We have also tested Sock Shop on the Apcera Enterprise Edition running a multi-cloud cluster that spanned across AWS, GCP, and VMware.
1111

1212
### Packaging
1313

14-
The Socks Shop application is packaged and configured for Apcera using a [Multi-Resource Manifest file](https://docs.apcera.com/jobs/multi-resource-manifests/) called socksshop-docker.json which is similar to a Docker Compose file. Scripts are provided to make it easy to deploy all the services and a network from the manifest, to start and stop the services, and to delete everything that was deployed.
14+
The Sock Shop application is packaged and configured for Apcera using a [Multi-Resource Manifest file](https://docs.apcera.com/jobs/multi-resource-manifests/) called socksshop-docker.json which is similar to a Docker Compose file. Scripts are provided to make it easy to deploy all the services and a network from the manifest, to start and stop the services, and to delete everything that was deployed.
1515

1616
### Pre-requisites
1717

@@ -23,19 +23,19 @@ The Socks Shop application is packaged and configured for Apcera using a [Multi-
2323
git clone https://github.com/microservices-demo/microservices-demo
2424
cd microservices-demo/deploy/apcera
2525
```
26-
- *(Optional)* If you are not an admin user in your Apcera cluster, you might need an Apcera administrator to import a [policy](https://docs.apcera.com/policy/introduction/) file to give you permission to create the Socks Shop services and network in your sandbox.
26+
- *(Optional)* If you are not an admin user in your Apcera cluster, you might need an Apcera administrator to import a [policy](https://docs.apcera.com/policy/introduction/) file to give you permission to create the Sock Shop services and network in your sandbox.
2727

2828
```
2929
apc import policy socksShop.pol
3030
```
3131

3232
### Networking and Security
3333

34-
In this demo scenario, we create a single [virtual network](https://docs.apcera.com/jobs/virtual-networks/) to which all the services except *zipkin* and *user-sim* are added. Services inside the virtual network can all talk to each other. Apcera [job links](https://docs.apcera.com/jobs/job-links/) are used to let the *user-sim* load testing service send requests to the *front-end* service and to let the main Socks Shop services send traces to the *zipkin* service. Using job links in this fashion simulates how real, cloud-based load testing and APM solutions can be integrated into applications running on Apcera without sacrificing security.
34+
In this demo scenario, we create a single [virtual network](https://docs.apcera.com/jobs/virtual-networks/) to which all the services except *zipkin* and *user-sim* are added. Services inside the virtual network can all talk to each other. Apcera [job links](https://docs.apcera.com/jobs/job-links/) are used to let the *user-sim* load testing service send requests to the *front-end* service and to let the main Sock Shop services send traces to the *zipkin* service. Using job links in this fashion simulates how real, cloud-based load testing and APM solutions can be integrated into applications running on Apcera without sacrificing security.
3535

3636
### Deployment
3737

38-
All of the Socks Shop services and the network are deployed to Apcera with a single script. However, you first need to target your cluster and login to it with APC. After that, just run the deploySocksShop.sh script.
38+
All of the Sock Shop services and the network are deployed to Apcera with a single script. However, you first need to target your cluster and login to it with APC. After that, just run the deploySocksShop.sh script.
3939

4040
<!-- deploy-doc require-env APCERA_CLUSTER APCERA_USER APCERA_PASSWORD -->
4141
<!-- deploy-doc-hidden pre-install
@@ -57,13 +57,13 @@ After determining your targeted cluster and default namespace, this script does
5757
- It sets your current namespace to \<your_default_namespace\>/socksshop.
5858
- It runs the "apc manifest deploy" command against the socksshop-docker.json manifest to create the services and the socksshop-network virtual network.
5959
- It creates [job affinity tags](https://docs.apcera.com/jobs/job-affinity/) to make sure that each service that uses a database is deployed to the same Apcera instance manager as the database.
60-
- It then runs the startSocksShop.sh script to start all of the Socks Shop services.
60+
- It then runs the startSocksShop.sh script to start all of the Sock Shop services.
6161

6262
Altogether, the script should take under two minutes to run.
6363

6464
### Using
6565

66-
- You can access the Socks Shop front-end service in a browser with the URL:
66+
- You can access the Sock Shop front-end service in a browser with the URL:
6767
- http://front-end.\<your_cluster\>
6868
- Note that the *edge-router* service is not used since Apcera provides its own router.
6969
- You can view logs for the services in the Apcera Web Console or by using the "apc app logs" command.
@@ -81,7 +81,7 @@ You can use the startSocksShop.sh and stopSocksShop.sh scripts to start and stop
8181

8282
### Cleaning up
8383

84-
Run the deleteSocksShop.sh script to delete the Socks Shop services and network.
84+
Run the deleteSocksShop.sh script to delete the Sock Shop services and network.
8585

8686
<!-- deploy-doc-start destroy-infrastructure -->
8787

deployment/ecs-weave-shippable.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ layout: default
66

77

88
### Goal
9-
In this scenario, you'll set up and run the containerized Socks Shop
9+
In this scenario, you'll set up and run the containerized Sock Shop
1010
eCommerce application, with fully automated deployments, in 30
1111
minutes or less.
1212

@@ -94,7 +94,7 @@ Take note of the following values:
9494
### Configure an automated CI/CD pipeline
9595

9696
Your Weave-enabled Amazon ECS cluster should now be running 15 out of the 16 services
97-
of the Socks Shop application (verify this by navigating to [EC2 Container Service](https://console.aws.amazon.com/ecs/home#/clusters/ecs-weave-shippable-demo/services)).
97+
of the Sock Shop application (verify this by navigating to [EC2 Container Service](https://console.aws.amazon.com/ecs/home#/clusters/ecs-weave-shippable-demo/services)).
9898
We'll use Shippable to set up an automated CI/CD pipeline to deploy the
9999
<a href="https://github.com/microservices-demo/front-end" style="color: orange">
100100
front-end</a> service.

docs/index.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ layout: default
77

88
<h2>Introduction</h2>
99
<p>
10-
Socks Shop microservices are designed to have minimal expectations, using DNS to find other services.
10+
Sock Shop microservices are designed to have minimal expectations, using DNS to find other services.
1111
This means that it is possible to insert load-balancers and service routers, as required or desired.
1212
</p>
1313
<p>
1414
There are pre-built configuration scripts for various platforms that aim to make running the whole application simple.
1515
</p>
1616
<p>
17-
Socks Shop can be used to illustrate microservices architectures, demonstrate platforms at talks and meetups, or as a training and education tool.
17+
Sock Shop can be used to illustrate microservices architectures, demonstrate platforms at talks and meetups, or as a training and education tool.
1818
</p>
1919
<p>
2020
Please let us know how you use it!

docs/quickstart.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ layout: quickstart
33
---
44
## Quick start
55

6-
The easiest and fastest way to get started with the Socks Shop application is by using Docker Compose. If you don't have Docker and Compose installed,
6+
The easiest and fastest way to get started with the Sock Shop application is by using Docker Compose. If you don't have Docker and Compose installed,
77
please visit the [the Docker website](https://www.docker.com) for instructions on how to install them.
88

99
### Clone the application repository

docs/user-accounts.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
layout: default
33
---
44
<h2>User Accounts</h2>
5-
<p>To log into Socks Shop and complete a transaction, you'll need credentials.
5+
<p>To log into Sock Shop and complete a transaction, you'll need credentials.
66
The 'user' microservice ships with the following accounts.</p>
77
<table class="user-creds">
88
<thead>

0 commit comments

Comments
 (0)