Skip to content

Commit bc7f08c

Browse files
marcingrzejszczakmarcingrzejszczak
committed
Fixed code for mac
1 parent bf48914 commit bc7f08c

7 files changed

+51
-12
lines changed

‎app.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,5 +106,6 @@ app.delete('/api/books/:_id', (req, res) => {
106106
});
107107
});
108108

109-
app.listen(3000);
110-
console.log('Running on port 3000...');
109+
const port = 9876;
110+
app.listen(port);
111+
console.log('Running on port ' + port + ' ...');

‎run_contract_tests.sh‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
set -o errexit
44

5-
SC_CONTRACT_DOCKER_VERSION="${SC_CONTRACT_DOCKER_VERSION:-2.0.2.BUILD-SNAPSHOT}"
5+
SC_CONTRACT_DOCKER_VERSION="${SC_CONTRACT_DOCKER_VERSION:-2.0.0.BUILD-SNAPSHOT}"
66
APP_IP="$( ./whats_my_ip.sh )"
7-
APP_PORT="${APP_PORT:-3000}"
7+
APP_PORT="${APP_PORT:-9876}"
88
ARTIFACTORY_PORT="${ARTIFACTORY_PORT:-8081}"
99
APPLICATION_BASE_URL="http://${APP_IP}:${APP_PORT}"
1010
ARTIFACTORY_URL="http://${APP_IP}:${ARTIFACTORY_PORT}/artifactory/libs-release-local"
@@ -19,6 +19,19 @@ echo "Artifactory URL [${ARTIFACTORY_URL}]"
1919
echo "Project Version [${PROJECT_VERSION}]"
2020

2121
mkdir -p build/spring-cloud-contract/output
22-
docker run --rm -e "APPLICATION_BASE_URL=${APPLICATION_BASE_URL}" -e "PUBLISH_ARTIFACTS=true" -e "PROJECT_NAME=${PROJECT_NAME}" -e "PROJECT_GROUP=${PROJECT_GROUP}" -e "REPO_WITH_BINARIES_URL=${ARTIFACTORY_URL}" -e "PROJECT_VERSION=${PROJECT_VERSION}" -v "${CURRENT_DIR}/contracts/:/contracts:ro" -v "${CURRENT_DIR}/build/spring-cloud-contract/output:/spring-cloud-contract-output/" springcloud/spring-cloud-contract:"${SC_CONTRACT_DOCKER_VERSION}"
2322

24-
docker run --rm -v "${CURRENT_DIR}/build/spring-cloud-contract/output:/spring-cloud-contract-output/" springcloud/spring-cloud-contract:"${SC_CONTRACT_DOCKER_VERSION}" chown -R $(id -u):$(id -g) "/spring-cloud-contract-output/"
23+
docker run --rm \
24+
-e "APPLICATION_BASE_URL=${APPLICATION_BASE_URL}" \
25+
-e "PUBLISH_ARTIFACTS=true" \
26+
-e "PROJECT_NAME=${PROJECT_NAME}" \
27+
-e "PROJECT_GROUP=${PROJECT_GROUP}" \
28+
-e "REPO_WITH_BINARIES_URL=${ARTIFACTORY_URL}" \
29+
-e "PROJECT_VERSION=${PROJECT_VERSION}" \
30+
-v "${CURRENT_DIR}/contracts/:/contracts:ro" \
31+
-v "${CURRENT_DIR}/build/spring-cloud-contract/output:/spring-cloud-contract-output/" \
32+
springcloud/spring-cloud-contract:"${SC_CONTRACT_DOCKER_VERSION}"
33+
34+
docker run --rm \
35+
-v "${CURRENT_DIR}/build/spring-cloud-contract/output:/spring-cloud-contract-output/" \
36+
springcloud/spring-cloud-contract:"${SC_CONTRACT_DOCKER_VERSION}" \
37+
chown -R $(id -u):$(id -g) "/spring-cloud-contract-output/"

‎run_contract_tests_from_external_contracts.sh‎

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

88
SC_CONTRACT_DOCKER_VERSION="${SC_CONTRACT_DOCKER_VERSION:-2.0.2.BUILD-SNAPSHOT}"
99
APP_IP="$( ./whats_my_ip.sh )"
10-
APP_PORT="${APP_PORT:-3000}"
10+
APP_PORT="${APP_PORT:-9876}"
1111
ARTIFACTORY_PORT="${ARTIFACTORY_PORT:-8081}"
1212
APPLICATION_BASE_URL="http://${APP_IP}:${APP_PORT}"
1313
ARTIFACTORY_URL="http://${APP_IP}:${ARTIFACTORY_PORT}/artifactory/libs-release-local"

‎run_contract_tests_from_git.sh‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ echo "Now we have a git repository available under ["${CURRENT_DIR}"/build/contr
1414

1515
SC_CONTRACT_DOCKER_VERSION="${SC_CONTRACT_DOCKER_VERSION:-2.0.2.BUILD-SNAPSHOT}"
1616
APP_IP="$( ./whats_my_ip.sh )"
17-
APP_PORT="${APP_PORT:-3000}"
17+
APP_PORT="${APP_PORT:-9876}"
1818
APPLICATION_BASE_URL="http://${APP_IP}:${APP_PORT}"
1919
PROJECT_NAME="${PROJECT_NAME:-bookstore}"
2020
PROJECT_GROUP="${PROJECT_GROUP:-com.example}"
@@ -27,6 +27,23 @@ echo "Project Version [${PROJECT_VERSION}]"
2727
# If you want to work offline just attach this volume
2828
# -v "${HOME}/.m2/:/root/.m2:ro"
2929
mkdir -p build/spring-cloud-contract/output
30-
docker run --rm -e "PUBLISH_STUBS_TO_SCM=true" -e "PUBLISH_ARTIFACTS=false" -e "APPLICATION_BASE_URL=${APPLICATION_BASE_URL}" -e "PROJECT_NAME=${PROJECT_NAME}" -e "PROJECT_GROUP=${PROJECT_GROUP}" -e "REPO_WITH_BINARIES_URL=${ARTIFACTORY_URL}" -e "PROJECT_VERSION=${PROJECT_VERSION}" -e "EXTERNAL_CONTRACTS_REPO_WITH_BINARIES_URL=git://file:/contracts_git/" -e "EXTERNAL_CONTRACTS_ARTIFACT_ID=${PROJECT_NAME}" -e "EXTERNAL_CONTRACTS_GROUP_ID=${PROJECT_GROUP}" -e "EXTERNAL_CONTRACTS_VERSION=${PROJECT_VERSION}" -v "${CURRENT_DIR}/build/contracts_git/:/contracts_git:rw" -v "${CURRENT_DIR}/build/spring-cloud-contract/output:/spring-cloud-contract-output/" springcloud/spring-cloud-contract:"${SC_CONTRACT_DOCKER_VERSION}"
30+
docker run --rm \
31+
-e "PUBLISH_STUBS_TO_SCM=true" \
32+
-e "PUBLISH_ARTIFACTS=false" \
33+
-e "APPLICATION_BASE_URL=${APPLICATION_BASE_URL}" \
34+
-e "PROJECT_NAME=${PROJECT_NAME}" \
35+
-e "PROJECT_GROUP=${PROJECT_GROUP}" \
36+
-e "REPO_WITH_BINARIES_URL=${ARTIFACTORY_URL}" \
37+
-e "PROJECT_VERSION=${PROJECT_VERSION}" \
38+
-e "EXTERNAL_CONTRACTS_REPO_WITH_BINARIES_URL=git://file:/contracts_git/" \
39+
-e "EXTERNAL_CONTRACTS_ARTIFACT_ID=${PROJECT_NAME}" \
40+
-e "EXTERNAL_CONTRACTS_GROUP_ID=${PROJECT_GROUP}" \
41+
-e "EXTERNAL_CONTRACTS_VERSION=${PROJECT_VERSION}" \
42+
-v "${CURRENT_DIR}/build/contracts_git/:/contracts_git:rw" \
43+
-v "${CURRENT_DIR}/build/spring-cloud-contract/output:/spring-cloud-contract-output/" \
44+
springcloud/spring-cloud-contract:"${SC_CONTRACT_DOCKER_VERSION}"
3145

32-
docker run --rm -v "${CURRENT_DIR}/build/spring-cloud-contract/output:/spring-cloud-contract-output/" springcloud/spring-cloud-contract:"${SC_CONTRACT_DOCKER_VERSION}" chown -R $(id -u):$(id -g) "/spring-cloud-contract-output/"
46+
docker run --rm \
47+
-v "${CURRENT_DIR}/build/spring-cloud-contract/output:/spring-cloud-contract-output/" \
48+
springcloud/spring-cloud-contract:"${SC_CONTRACT_DOCKER_VERSION}" \
49+
chown -R $(id -u):$(id -g) "/spring-cloud-contract-output/"

‎setup_infra.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ git submodule foreach git pull origin master
66

77
echo "Building docker"
88
pushd docker
9+
yes | docker-compose rm -v
910
docker-compose build
1011
docker-compose up -d
1112
popd

‎upload_external_contracts_to_artifactory.sh‎

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

88
SC_CONTRACT_DOCKER_VERSION="${SC_CONTRACT_DOCKER_VERSION:-2.0.2.BUILD-SNAPSHOT}"
99
APP_IP="$( ./whats_my_ip.sh )"
10-
APP_PORT="${APP_PORT:-3000}"
10+
APP_PORT="${APP_PORT:-9876}"
1111
ARTIFACTORY_PORT="${ARTIFACTORY_PORT:-8081}"
1212
APPLICATION_BASE_URL="http://${APP_IP}:${APP_PORT}"
1313
ARTIFACTORY_URL="http://admin:password@${APP_IP}:${ARTIFACTORY_PORT}/artifactory/libs-release-local"

‎whats_my_ip.sh‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,10 @@
11
#!/bin/bash
22

3-
ifconfig | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1' | head -n 1
3+
case "`uname`" in
4+
Darwin* )
5+
echo "host.docker.internal"
6+
;;
7+
* )
8+
ifconfig | grep -Eo 'inet (addr:)?([0-9]*\.){3}[0-9]*' | grep -Eo '([0-9]*\.){3}[0-9]*' | grep -v '127.0.0.1' | head -n 1
9+
;;
10+
esac

0 commit comments

Comments
 (0)