Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update local refresh script #258

Merged
merged 4 commits into from
Aug 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# IntelliJ project files
.idea
.idea/**
!.idea/php.xml
!.idea/.name

# Logs
logs
Expand Down
1 change: 1 addition & 0 deletions .idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

26 changes: 26 additions & 0 deletions .idea/php.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .lintstagedrc.mjs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import chalk from "chalk";
import path from "path";
import { execSync } from "child_process";
import path from "node:path";
import { execSync } from "node:child_process";

const generateTerraformDocs = (filenames) => {
try {
Expand Down
9 changes: 2 additions & 7 deletions app/api/config/autoload/config.global.php
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,8 @@
],
'export' => [
'driverClass' => \Doctrine\DBAL\Driver\PDO\MySQL\Driver::class,
'params' => $doctrine_connection_params +
[
'driverOptions' => [
PDO::MYSQL_ATTR_USE_BUFFERED_QUERY => false,
PDO::CURSOR_FWDONLY => true,
],
],
// Database connection details
'params' => $doctrine_connection_params,
],
],
'driver' => [
Expand Down
2 changes: 2 additions & 0 deletions app/api/config/autoload/local.php.dist
Original file line number Diff line number Diff line change
Expand Up @@ -346,12 +346,14 @@ return [
'client' => [ // Guzzle client options; see https://docs.guzzlephp.org/en/stable/quickstart.html
'base_uri' => '', //param
'headers' => [], // additional or override default client headers
'proxy' => new \Laminas\Stdlib\ArrayUtils\MergeRemoveKey(),
],
'oauth2' => [ // if client['headers']['Authorization'] is not set, then this will be used to get token
'client_id' => '', //param
'client_secret' => '', // secret
'token_url' => '', //param
'scope' => '', //param
'proxy' => new \Laminas\Stdlib\ArrayUtils\MergeRemoveKey(),
],
],
];
8 changes: 0 additions & 8 deletions app/internal/config/application.config.php
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,4 @@
// 'service_manager' => array(),
];

if (file_exists(__DIR__ . '/../vendor/laminas/laminas-developer-tools/src/Module.php')) {
$config['modules'][] = 'Laminas\DeveloperTools';

if (file_exists(__DIR__ . '/../vendor/san/san-session-toolbar/src/Module.php')) {
$config['modules'][] = 'SanSessionToolbar';
}
}

return $config;
8 changes: 4 additions & 4 deletions app/internal/config/autoload/local.php.dist
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ return [
'backend' => [
'options' => [
// Backend service URI *Environment specific*
'route' => 'backend-nginx',
'route' => 'api.local.olcs.dev-dvsacloud.uk',
]
]
]
Expand All @@ -31,11 +31,11 @@ return [
'endpoints' => [
// Backend service URI *Environment specific*
'backend' => [
'url' => 'backend-nginx',
'url' => 'api.local.olcs.dev-dvsacloud.uk',
],
// Postcode/Address service URI *Environment specific*
'postcode' => [
'url' => 'backend-nginx',
'url' => 'https://int.nonprod.address.dvsa.api.gov.uk/',
],
]
],
Expand Down Expand Up @@ -65,7 +65,7 @@ return [
],

// Asset path, URI to olcs-static (CSS, JS, etc] *Environment specific*
'asset_path' => 'http://localhost:7001',
'asset_path' => 'http://cdn.local.olcs.dev-dvsacloud.uk/',

'openam' => [
'url' => 'http://olcs-auth.olcs.gov.uk:8081/secure/',
Expand Down
2 changes: 2 additions & 0 deletions app/internal/config/development.config.php.dist
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
return [
// Additional modules to include when in development mode
'modules' => [
'Laminas\DeveloperTools',
'SanSessionToolbar',
],
// Configuration overrides during development mode
'module_listener_options' => [
Expand Down
8 changes: 0 additions & 8 deletions app/selfserve/config/application.config.php
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,4 @@
],
];

if (file_exists(__DIR__ . '/../vendor/laminas/laminas-developer-tools/src/Module.php')) {
$config['modules'][] = 'Laminas\DeveloperTools';

if (file_exists(__DIR__ . '/../vendor/san/san-session-toolbar/src/Module.php')) {
$config['modules'][] = 'SanSessionToolbar';
}
}

return $config;
8 changes: 4 additions & 4 deletions app/selfserve/config/autoload/local.php.dist
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ return [
'backend' => [
'options' => [
// Backend service URI *Environment specific*
'route' => 'backend-nginx',
'route' => 'api.local.olcs.dev-dvsacloud.uk',
]
]
]
Expand All @@ -31,17 +31,17 @@ return [
'endpoints' => [
// Backend service URI *Environment specific*
'backend' => [
'url' => 'backend-nginx',
'url' => 'api.local.olcs.dev-dvsacloud.uk',
],
// Postcode/Address service URI *Environment specific*
'postcode' => [
'url' => 'http://address.reg.olcs.dev-dvsacloud.uk/',
'url' => 'https://int.nonprod.address.dvsa.api.gov.uk/',
],
]
],

// Asset path, URI to olcs-static (CSS, JS, etc) *Environment specific for local use http://127.0.0.1:7001*
'asset_path' => 'http://localhost:7001',
'asset_path' => 'http://cdn.local.olcs.dev-dvsacloud.uk/',

'openam' => new \Laminas\Stdlib\ArrayUtils\MergeRemoveKey(),

Expand Down
2 changes: 2 additions & 0 deletions app/selfserve/config/development.config.php.dist
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
return [
// Additional modules to include when in development mode
'modules' => [
'Laminas\DeveloperTools',
'SanSessionToolbar',
],
// Configuration overrides during development mode
'module_listener_options' => [
Expand Down
5 changes: 5 additions & 0 deletions infra/docker/cli/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ RUN apk add --no-cache linux-headers $PHPIZE_DEPS \
&& docker-php-ext-enable xdebug \
&& apk del linux-headers $PHPIZE_DEPS

RUN apk update && \
apk add --no-cache openldap-dev \
&& docker-php-ext-install ldap \
&& docker-php-ext-enable ldap

RUN \
# Disable OPCache in development.
echo "opcache.enable=0" >> ${PHP_INI_DIR}/conf.d/1000-php.ini \
Expand Down
Loading