Skip to content

Commit

Permalink
Merge pull request #72 from ConductionNL/dev-gino
Browse files Browse the repository at this point in the history
fixture update
  • Loading branch information
ginokok1996 authored Dec 1, 2020
2 parents 7689aa9 + 6619f76 commit e815d74
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 10 deletions.
18 changes: 9 additions & 9 deletions .github/workflows/dockerimage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,30 +28,30 @@ jobs:
run: |
export VERSION=$(grep APP_VERSION= .env | cut -d '=' -f2)
export RELEASE=$VERSION.$(date --utc +%y%m%d)
echo ::set-env name=RELEASE::$RELEASE
echo "RELEASE=$RELEASE" >> $GITHUB_ENV
echo "##[set-output name=releasename]$RELEASE"
- name: Setting APP_NAME
run: |
export NAME=$(grep APP_NAME= .env | cut -d '=' -f2)
echo ::set-env name=APP_NAME::$NAME
echo "APP_NAME=$NAME" >> $GITHUB_ENV
- name: Print app name
run: echo "APP_NAME = $APP_NAME"
- name: Setting APP_ENV to dev
run: |
echo ::set-env name=APP_ENV::dev
echo ::set-env name=APP_BUILD::dev
echo "APP_ENV=dev">> $GITHUB_ENV
echo "APP_BUILD=dev">> $GITHUB_ENV
echo "set APP_ENV to $APP_ENV"
- name: Setting APP_ENV to prod
if: contains( github.ref, 'master' ) || contains( github.base_ref, 'master' )
run: |
echo ::set-env name=APP_ENV::latest
echo ::set-env name=APP_BUILD::$RELEASE
echo "APP_ENV=latest">> $GITHUB_ENV
echo "APP_BUILD=$RELEASE">> $GITHUB_ENV
echo "set APP_ENV to $APP_ENV"
- name: Setting APP_ENV to stag
if: contains( github.ref, 'staging' ) || contains( github.base_ref, 'staging' )
run: |
echo ::set-env name=APP_ENV::stag
echo ::set-env name=APP_BUILD::stag
echo "APP_ENV=stag">> $GITHUB_ENV
echo "APP_BUILD=stag">> $GITHUB_ENV
echo "set APP_ENV to $APP_ENV"
- name: Print definitive APP_ENV
run: echo "APP_ENV is now $APP_ENV and APP_BUILD is now $APP_BUILD"
Expand Down Expand Up @@ -86,7 +86,7 @@ jobs:
docker tag "${image}":latest "${image}":"${APP_BUILD}"
fi
done
echo ::set-env name=IMAGES::$images
echo "IMAGES=$images" >> $GITHUB_ENV
- name: Chores
run: docker-compose down
- name: Show all images
Expand Down
50 changes: 49 additions & 1 deletion api/src/DataFixtures/AppFixtures.php
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public function load(ObjectManager $manager)
$service = new Service();
$service->setType('mailer');
$service->setOrganization('https://dev.zuid-drecht.nl/api/v1/wrc/organizations/c571bdad-f34c-4e24-94e7-74629cfaccc9');
$service->setAuthorization($this->params->get('mailgun_key'));
$service->setAuthorization('mailgun+api://!changeme!:[email protected]');
$manager->persist($service);
$service->setId($id);
$manager->persist($service);
Expand All @@ -100,6 +100,54 @@ public function load(ObjectManager $manager)
$service->setId($id);
$manager->persist($service);

$manager->flush();
}
if (
strpos($this->params->get('app_domain'), 'commonground.nu') != false ||
$this->params->get('app_domain') == 'commonground.nu'

) {
$id = Uuid::fromString('30a1ccce-6ed5-4647-af04-d319b292e232');
$service = new Service();
$service->setType('mailer');
$service->setOrganization($this->commonGroundService->cleanUrl(['component'=>'wrc', 'type'=>'organizations', 'id'=>'073741b3-f756-4767-aa5d-240f167ca89d']));
$service->setAuthorization('mailgun+api://!changeme!:[email protected]');
$manager->persist($service);
$service->setId($id);
$manager->persist($service);

$manager->flush();
}
if (
strpos($this->params->get('app_domain'), 'id-vault.com') != false ||
$this->params->get('app_domain') == 'id-vault.com'

) {
$id = Uuid::fromString('765b1186-1730-4b08-8c15-e6be0886d1fa');
$service = new Service();
$service->setType('mailer');
$service->setOrganization($this->commonGroundService->cleanUrl(['component'=>'wrc', 'type'=>'organizations', 'id'=>'360e17fb-1a98-48b7-a2a8-212c79a5f51a']));
$service->setAuthorization('mailgun+api://!changeme!:[email protected]');
$manager->persist($service);
$service->setId($id);
$manager->persist($service);

$manager->flush();
}
if (
strpos($this->params->get('app_domain'), 'conduction.academy') != false ||
$this->params->get('app_domain') == 'conduction.academy'

) {
$id = Uuid::fromString('e0c98e7a-7462-448c-9b25-7d23b81c7190');
$service = new Service();
$service->setType('mailer');
$service->setOrganization('https://dev.zuid-drecht.nl/api/v1/wrc/organizations/c571bdad-f34c-4e24-94e7-74629cfaccc9');
$service->setAuthorization('mailgun+api://!changeme!:[email protected]');
$manager->persist($service);
$service->setId($id);
$manager->persist($service);

$manager->flush();
}
}
Expand Down

0 comments on commit e815d74

Please sign in to comment.