Skip to content

Commit 911b4c6

Browse files
committed
Upgraded Docker base image, misc other changes
1 parent 4597669 commit 911b4c6

File tree

12 files changed

+42
-13
lines changed

12 files changed

+42
-13
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
kubectl create secret generic ftgo-db-secret \
2-
--from-file=username=./dbuser.txt \
3-
--from-file=password=./dbpassword.txt
2+
--from-literal=username=mysqluser \
3+
--from-literal=password=mysqlpw

deployment/kubernetes/misc/dbpassword.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

deployment/kubernetes/misc/dbuser.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

ftgo-accounting-service/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM java:openjdk-8u111-alpine
1+
FROM openjdk:8u171-jre-alpine
22
RUN apk --no-cache add curl
33
CMD java ${JAVA_OPTS} -jar ftgo-accounting-service.jar
44
HEALTHCHECK --start-period=30s --interval=5s CMD curl -f http://localhost:8080/actuator/health || exit 1

ftgo-api-gateway/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM java:openjdk-8u111-alpine
1+
FROM openjdk:8u171-jre-alpine
22
RUN apk --no-cache add curl
33
CMD java ${JAVA_OPTS} -jar ftgo-api-gateway.jar
44
HEALTHCHECK --start-period=30s --interval=5s CMD curl -f http://localhost:8080/actuator/health || exit 1

ftgo-consumer-service/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM java:openjdk-8u111-alpine
1+
FROM openjdk:8u171-jre-alpine
22
RUN apk --no-cache add curl
33
CMD java ${JAVA_OPTS} -jar ftgo-consumer-service.jar
44
HEALTHCHECK --start-period=30s --interval=5s CMD curl -f http://localhost:8080/actuator/health || exit 1

ftgo-kitchen-service/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM java:openjdk-8u111-alpine
1+
FROM openjdk:8u171-jre-alpine
22
RUN apk --no-cache add curl
33
CMD java ${JAVA_OPTS} -jar ftgo-kitchen-service.jar
44
HEALTHCHECK --start-period=30s --interval=5s CMD curl -f http://localhost:8080/actuator/health || exit 1

ftgo-order-history-service/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM java:openjdk-8u111-alpine
1+
FROM openjdk:8u171-jre-alpine
22
RUN apk --no-cache add curl
33
CMD java ${JAVA_OPTS} -jar ftgo-order-history-service.jar
44
HEALTHCHECK --start-period=30s --interval=5s CMD curl -f http://localhost:8080/actuator/health || exit 1

ftgo-order-service/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM java:openjdk-8u111-alpine
1+
FROM openjdk:8u171-jre-alpine
22
RUN apk --no-cache add curl
33
CMD java ${JAVA_OPTS} -jar ftgo-order-service.jar
44
HEALTHCHECK --start-period=30s --interval=5s CMD curl -f http://localhost:8080/actuator/health || exit 1

ftgo-order-service/src/component-test/resources/features/createorder.feature renamed to ftgo-order-service/src/component-test/resources/features/place-order.feature

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
Feature: Create order
1+
Feature: Place Order
22

33
As a consumer of the Order Service
4-
I should be able to create an order
4+
I should be able to place an order
55

66
Scenario: Order authorized
77
Given A valid consumer

ftgo-restaurant-service/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM java:openjdk-8u111-alpine
1+
FROM openjdk:8u171-jre-alpine
22
RUN apk --no-cache add curl
33
CMD java ${JAVA_OPTS} -jar ftgo-restaurant-service.jar
44
HEALTHCHECK --start-period=30s --interval=5s CMD curl -f http://localhost:8080/actuator/health || exit 1

run-end-to-end-tests.sh

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#! /bin/bash -e
2+
3+
. ./set-env.sh
4+
5+
initializeDynamoDB() {
6+
echo preparing dynamodblocal table data
7+
cd dynamodblocal-init
8+
./create-dynamodb-tables.sh
9+
cd ..
10+
echo data is prepared
11+
}
12+
13+
14+
./gradlew assemble
15+
16+
docker-compose up -d --build
17+
18+
./wait-for-mysql.sh
19+
20+
echo mysql is started
21+
22+
initializeDynamoDB
23+
24+
date
25+
26+
./wait-for-services.sh
27+
28+
./gradlew :ftgo-end-to-end-tests:cleanTest :ftgo-end-to-end-tests:test
29+
30+
docker-compose down -v
31+

0 commit comments

Comments
 (0)