Skip to content

Commit 063cf6f

Browse files
authored
Merge pull request #39 from Mathieudewet/fix/bucket-deployment
fix bucket deployment
2 parents 3392c60 + b372cff commit 063cf6f

File tree

4 files changed

+15
-12
lines changed

4 files changed

+15
-12
lines changed

api/behat.yml.dist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ default:
1414
bootstrap: "features/bootstrap/bootstrap.php"
1515
class: "App\\Kernel"
1616
Behat\MinkExtension:
17-
base_url: "http://localhost/"
17+
base_url: "https://localhost/"
1818
sessions:
1919
default:
2020
symfony2: ~

api/config/packages/security.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@ security:
1616

1717
# form_login: ~
1818
# https://symfony.com/doc/current/security/form_login_setup.html
19+
20+
access_control:
21+
- { path: ^/, roles: IS_AUTHENTICATED_ANONYMOUSLY, requires_channel: https }

ci/before_install.sh

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

33
if [[ $TRAVIS_PULL_REQUEST != 'false' ]]; then echo 'Skipping deployment for pull requests';
44
else
5-
if [[ -z "${PROJECT_ID}" ]]; then echo 'PROJECT_ID is not defined in your travis environement variables.'; exit 1; fi
6-
if [[ -z "${ADMIN_BUCKET}" ]]; then echo 'ADMIN_BUCKET is not defined in your travis environement variables.'; exit 1; fi
7-
if [[ -z "${CLIENT_BUCKET}" ]]; then echo 'CLIENT_BUCKET is not defined in your travis environement variables.'; exit 1; fi
8-
if [[ -z "${CI_SERVICE_ACCOUNT}" ]]; then echo 'CI_SERVICE_ACCOUNT is not defined in your ci repository environement variables.'; exit 1; fi
9-
if [[ -z "${DATABASE_USER}" ]]; then echo 'DATABASE_USER is not defined in your travis environement variables.'; exit 1; fi
10-
if [[ -z "${DATABASE_PASSWORD}" ]]; then echo 'DATABASE_PASSWORD is not defined in your travis environement variables.'; exit 1; fi
11-
if [[ -z "${DATABASE_NAME}" ]]; then echo 'DATABASE_NAME is not defined in your travis environement variables.'; exit 1; fi
12-
if [[ -z "${DEV_ADMIN_BUCKET}" && MULTI_BRANCH == "1" ]]; then echo 'DEV_ADMIN_BUCKET is not defined in your travis environement variables.'; exit 1; fi
13-
if [[ -z "${DEV_CLIENT_BUCKET}" && MULTI_BRANCH == "1" ]]; then echo 'DEV_CLIENT_BUCKET is not defined in your travis environement variables.'; exit 1; fi
5+
if [[ -z "${PROJECT_ID}" ]]; then echo 'PROJECT_ID is not defined in your travis environement variables.'; fi
6+
if [[ -z "${ADMIN_BUCKET}" ]]; then echo 'ADMIN_BUCKET is not defined in your travis environement variables.'; fi
7+
if [[ -z "${CLIENT_BUCKET}" ]]; then echo 'CLIENT_BUCKET is not defined in your travis environement variables.'; fi
8+
if [[ -z "${CI_SERVICE_ACCOUNT}" ]]; then echo 'CI_SERVICE_ACCOUNT is not defined in your ci repository environement variables.'; fi
9+
if [[ -z "${DATABASE_USER}" ]]; then echo 'DATABASE_USER is not defined in your travis environement variables.'; fi
10+
if [[ -z "${DATABASE_PASSWORD}" ]]; then echo 'DATABASE_PASSWORD is not defined in your travis environement variables.'; fi
11+
if [[ -z "${DATABASE_NAME}" ]]; then echo 'DATABASE_NAME is not defined in your travis environement variables.'; fi
12+
if [[ -z "${DEV_ADMIN_BUCKET}" && MULTI_BRANCH == "1" ]]; then echo 'DEV_ADMIN_BUCKET is not defined in your travis environement variables.'; fi
13+
if [[ -z "${DEV_CLIENT_BUCKET}" && MULTI_BRANCH == "1" ]]; then echo 'DEV_CLIENT_BUCKET is not defined in your travis environement variables.'; fi
1414
fi

ci/deploy.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ gcloud docker -- push ${VARNISH_REPOSITORY}:latest;
2929

3030
# Perform a rolling update if a release in the given namespace ever exist, create one otherwise.
3131
# Be aware that we have the static ip for the master branch but it belongs to you to care about others.
32-
helm upgrade --install --reset-values --wait --force --namespace=${BRANCH} --recreate-pods demo ./api/helm/api STATIC_IP \
32+
helm upgrade --install --reset-values --wait --force --namespace=${BRANCH} --recreate-pods demo ./api/helm/api STATIC_IP \
3333
--set php.repository=${PHP_REPOSITORY} \
3434
--set nginx.repository=${NGINX_REPOSITORY} \
3535
--set varnish.repository=${VARNISH_REPOSITORY} \
@@ -49,7 +49,7 @@ else
4949
fi
5050

5151
cd admin && yarn && REACT_APP_API_ENTRYPOINT=https://${API_ENTRYPOINT} yarn build --environment=prod;
52-
cd ../client && yarn && REACT_APP_ADMIN_HOST_HTTPS=https://${ADMIN_BUCKET} REACT_APP_ADMIN_HOST_HTTP=http://${ADMIN_BUCKET} REACT_APP_API_CACHED_HOST_HTTPS=https://${API_ENTRYPOINT} REACT_APP_API_CACHED_HOST_HTTP=http://${API_ENTRYPOINT} yarn build --environment=prod;
52+
cd ../client && yarn && REACT_APP_ADMIN_HOST_HTTPS=https://${ADMIN_BUCKET} REACT_APP_ADMIN_HOST_HTTP=http://${ADMIN_BUCKET} REACT_APP_API_CACHED_HOST_HTTPS=https://${API_ENTRYPOINT} REACT_APP_API_CACHED_HOST_HTTP=http://${API_ENTRYPOINT} yarn build --environment=prod && cd ..;
5353

5454
if [[ ${BRANCH} == "master" ]]
5555
then

0 commit comments

Comments
 (0)