Skip to content

Commit 5699a61

Browse files
author
dmitriy
committed
refactoring + added integration with bitbucket pipelines
1 parent 6077653 commit 5699a61

34 files changed

+733
-624
lines changed

.bitbucket/dependencies.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
#!/usr/bin/env sh
2+
3+
set -eu
4+
5+
# Add python pip and bash
6+
apk add --no-cache py-pip bash make
7+
8+
# Install docker-compose via pip
9+
pip install --no-cache-dir docker-compose~=1.23.0
10+
docker-compose -v

.env

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
# DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
1212
#
1313
# Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
14-
# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
14+
# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
1515

1616
###> symfony/framework-bundle ###
1717
APP_ENV=dev

bitbucket-pipelines.yml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
image: docker:stable
2+
3+
options:
4+
docker: true
5+
6+
pipelines:
7+
default:
8+
- step:
9+
script:
10+
- chmod +x .bitbucket/dependencies.sh
11+
- .bitbucket/dependencies.sh
12+
- docker-compose -f docker-compose-test-ci.yml build
13+
- make start-test
14+
- docker ps -a
15+
- make wait-for-db
16+
- make drop-migrate
17+
- make generate-jwt-keys
18+
- make phpunit
19+
- make stop-test

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
{
22
"name": "dimadeush/docker-symfony-api",
3-
"description": "JSON REST API",
4-
"version": "1.0.0",
53
"type": "project",
4+
"description": "JSON REST API",
65
"keywords": [
76
"Docker",
87
"Nginx",
@@ -14,6 +13,7 @@
1413
"RabbitMQ"
1514
],
1615
"homepage": "https://github.com/dimadeush/docker-symfony-api",
16+
"version": "1.0.0",
1717
"license": "proprietary",
1818
"authors": [
1919
{

0 commit comments

Comments
 (0)