Skip to content

Commit 0f57ca7

Browse files
authored
Merge pull request #2 from garystafford/v1.2.0
V1.2.0
2 parents b7d90fd + f4b44cb commit 0f57ca7

File tree

22 files changed

+232
-146
lines changed

22 files changed

+232
-146
lines changed

Dockerfile

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
FROM golang:alpine
22
LABEL maintainer="Gary A. Stafford <[email protected]>"
3-
ENV REFRESHED_AT 2019-03-03
3+
ENV REFRESHED_AT 2019-03-11
44
EXPOSE 8000
55

66
RUN apk update && apk upgrade && apk add git
77

88
WORKDIR /go/src/app
99
COPY main.go .
10-
# RUN cat main.go
1110
RUN go get -d -v ./...
1211
RUN go install -v ./...
1312

part1_build_srv_images.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
readonly -a arr=(a b c a d e f g h)
99
# declare -a arr=(a)
10-
readonly tag=1.1.0
10+
readonly tag=1.2.0
1111

1212
for i in "${arr[@]}"
1313
do

part2_push_images.sh

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

88
readonly -a arr=(a b c a d e f g h)
99
# declare -a arr=(a)
10-
readonly tag=1.1.0
10+
readonly tag=1.2.0
1111

1212
for i in "${arr[@]}"
1313
do
1414
docker push "garystafford/go-srv-$i:$tag"
1515
done
1616

17-
docker push "garystafford/angular-observe:$tag"
17+
docker push "garystafford/angular-observe:1.1.0"

part5_service-builder.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
for service in services:
1919
output = template.render(service=service,
2020
replicas=2,
21-
versions='1.1.0')
21+
versions='1.2.0')
2222
print(output)
2323

2424
filename = "service-%s%s" % (service, '.yaml')

resources/services/angular-ui.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ metadata:
55
labels:
66
app: angular-ui
77
component: ui
8-
version: "1.1.0"
8+
version: "1.2.0"
99
spec:
1010
ports:
1111
- name: http
1212
port: 80
1313
selector:
1414
app: angular-ui
1515
component: ui
16-
version: "1.1.0"
16+
version: "1.2.0"
1717
---
1818
apiVersion: extensions/v1beta1
1919
kind: Deployment
@@ -22,7 +22,7 @@ metadata:
2222
labels:
2323
app: angular-ui
2424
component: ui
25-
version: "1.1.0"
25+
version: "1.2.0"
2626
spec:
2727
replicas: 2
2828
strategy:
@@ -31,19 +31,19 @@ spec:
3131
matchLabels:
3232
app: angular-ui
3333
component: ui
34-
version: "1.1.0"
34+
version: "1.2.0"
3535
template:
3636
metadata:
3737
labels:
3838
app: angular-ui
3939
component: ui
40-
version: "1.1.0"
40+
version: "1.2.0"
4141
annotations:
4242
sidecar.istio.io/inject: "true"
4343
spec:
4444
containers:
4545
- name: angular-ui
46-
image: registry.hub.docker.com/garystafford/angular-observe:1.1.0
46+
image: registry.hub.docker.com/garystafford/angular-observe:1.2.0
4747
resources:
4848
# requests:
4949
# memory: 100M

resources/services/service-a.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ metadata:
55
labels:
66
app: service-a
77
component: service
8-
version: "1.1.0"
8+
version: "1.2.0"
99
spec:
1010
ports:
1111
- name: http
1212
port: 80
1313
selector:
1414
app: service-a
1515
component: service
16-
version: "1.1.0"
16+
version: "1.2.0"
1717
---
1818
apiVersion: extensions/v1beta1
1919
kind: Deployment
@@ -22,7 +22,7 @@ metadata:
2222
labels:
2323
app: service-a
2424
component: service
25-
version: "1.1.0"
25+
version: "1.2.0"
2626
spec:
2727
replicas: 2
2828
strategy:
@@ -31,19 +31,19 @@ spec:
3131
matchLabels:
3232
app: service-a
3333
component: service
34-
version: "1.1.0"
34+
version: "1.2.0"
3535
template:
3636
metadata:
3737
labels:
3838
app: service-a
3939
component: service
40-
version: "1.1.0"
40+
version: "1.2.0"
4141
annotations:
4242
sidecar.istio.io/inject: "true"
4343
spec:
4444
containers:
4545
- name: service-a
46-
image: registry.hub.docker.com/garystafford/go-srv-a:1.1.0
46+
image: registry.hub.docker.com/garystafford/go-srv-a:1.2.0
4747
resources:
4848
# requests:
4949
# memory: 100M

resources/services/service-b.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ metadata:
55
labels:
66
app: service-b
77
component: service
8-
version: "1.1.0"
8+
version: "1.2.0"
99
spec:
1010
ports:
1111
- name: http
1212
port: 80
1313
selector:
1414
app: service-b
1515
component: service
16-
version: "1.1.0"
16+
version: "1.2.0"
1717
---
1818
apiVersion: extensions/v1beta1
1919
kind: Deployment
@@ -22,7 +22,7 @@ metadata:
2222
labels:
2323
app: service-b
2424
component: service
25-
version: "1.1.0"
25+
version: "1.2.0"
2626
spec:
2727
replicas: 2
2828
strategy:
@@ -31,19 +31,19 @@ spec:
3131
matchLabels:
3232
app: service-b
3333
component: service
34-
version: "1.1.0"
34+
version: "1.2.0"
3535
template:
3636
metadata:
3737
labels:
3838
app: service-b
3939
component: service
40-
version: "1.1.0"
40+
version: "1.2.0"
4141
annotations:
4242
sidecar.istio.io/inject: "true"
4343
spec:
4444
containers:
4545
- name: service-b
46-
image: registry.hub.docker.com/garystafford/go-srv-b:1.1.0
46+
image: registry.hub.docker.com/garystafford/go-srv-b:1.2.0
4747
resources:
4848
# requests:
4949
# memory: 100M

resources/services/service-c.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ metadata:
55
labels:
66
app: service-c
77
component: service
8-
version: "1.1.0"
8+
version: "1.2.0"
99
spec:
1010
ports:
1111
- name: http
1212
port: 80
1313
selector:
1414
app: service-c
1515
component: service
16-
version: "1.1.0"
16+
version: "1.2.0"
1717
---
1818
apiVersion: extensions/v1beta1
1919
kind: Deployment
@@ -22,7 +22,7 @@ metadata:
2222
labels:
2323
app: service-c
2424
component: service
25-
version: "1.1.0"
25+
version: "1.2.0"
2626
spec:
2727
replicas: 2
2828
strategy:
@@ -31,19 +31,19 @@ spec:
3131
matchLabels:
3232
app: service-c
3333
component: service
34-
version: "1.1.0"
34+
version: "1.2.0"
3535
template:
3636
metadata:
3737
labels:
3838
app: service-c
3939
component: service
40-
version: "1.1.0"
40+
version: "1.2.0"
4141
annotations:
4242
sidecar.istio.io/inject: "true"
4343
spec:
4444
containers:
4545
- name: service-c
46-
image: registry.hub.docker.com/garystafford/go-srv-c:1.1.0
46+
image: registry.hub.docker.com/garystafford/go-srv-c:1.2.0
4747
resources:
4848
# requests:
4949
# memory: 100M

resources/services/service-d.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ metadata:
55
labels:
66
app: service-d
77
component: service
8-
version: "1.1.0"
8+
version: "1.2.0"
99
spec:
1010
ports:
1111
- name: http
1212
port: 80
1313
selector:
1414
app: service-d
1515
component: service
16-
version: "1.1.0"
16+
version: "1.2.0"
1717
---
1818
apiVersion: extensions/v1beta1
1919
kind: Deployment
@@ -22,7 +22,7 @@ metadata:
2222
labels:
2323
app: service-d
2424
component: service
25-
version: "1.1.0"
25+
version: "1.2.0"
2626
spec:
2727
replicas: 2
2828
strategy:
@@ -31,19 +31,19 @@ spec:
3131
matchLabels:
3232
app: service-d
3333
component: service
34-
version: "1.1.0"
34+
version: "1.2.0"
3535
template:
3636
metadata:
3737
labels:
3838
app: service-d
3939
component: service
40-
version: "1.1.0"
40+
version: "1.2.0"
4141
annotations:
4242
sidecar.istio.io/inject: "true"
4343
spec:
4444
containers:
4545
- name: service-d
46-
image: registry.hub.docker.com/garystafford/go-srv-d:1.1.0
46+
image: registry.hub.docker.com/garystafford/go-srv-d:1.2.0
4747
resources:
4848
# requests:
4949
# memory: 100M

resources/services/service-e.yaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ metadata:
55
labels:
66
app: service-e
77
component: service
8-
version: "1.1.0"
8+
version: "1.2.0"
99
spec:
1010
ports:
1111
- name: http
1212
port: 80
1313
selector:
1414
app: service-e
1515
component: service
16-
version: "1.1.0"
16+
version: "1.2.0"
1717
---
1818
apiVersion: extensions/v1beta1
1919
kind: Deployment
@@ -22,7 +22,7 @@ metadata:
2222
labels:
2323
app: service-e
2424
component: service
25-
version: "1.1.0"
25+
version: "1.2.0"
2626
spec:
2727
replicas: 2
2828
strategy:
@@ -31,19 +31,19 @@ spec:
3131
matchLabels:
3232
app: service-e
3333
component: service
34-
version: "1.1.0"
34+
version: "1.2.0"
3535
template:
3636
metadata:
3737
labels:
3838
app: service-e
3939
component: service
40-
version: "1.1.0"
40+
version: "1.2.0"
4141
annotations:
4242
sidecar.istio.io/inject: "true"
4343
spec:
4444
containers:
4545
- name: service-e
46-
image: registry.hub.docker.com/garystafford/go-srv-e:1.1.0
46+
image: registry.hub.docker.com/garystafford/go-srv-e:1.2.0
4747
resources:
4848
# requests:
4949
# memory: 100M

0 commit comments

Comments
 (0)