Release #146
Open
Release #146
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In order to move the pic-sure-auth-micro-app to its own container I did the following: - Update HTTPD networking to redirect PSAMA request to the PSAMA container. - Added a new `.env` file that is passed to PSAMA as part of the build. - Updated the configuration pipeline to set values in the PSAMA`.env` file. - Removed PSAMA from WildFly database configuration. - Added necessary docker commands to both the `start-picsure.sh` and `stop-picsure.sh`.
The commit updates several .env variable names and values for a clearer and more accurate configuration. The changes include renaming CLIENT_ID and CLIENT_SECRET to inline with Application Properties. The flag to determine if secret is base64 is also added. In addition, a boolean flag is utilized to enable the use of Auth0 IDP Provider instead of setting the provider's name directly.
This commit introduces three Jenkins jobs related to the PIC-SURE Auth Micro-App; one for building and deploying the application, one for uploading updated configurations, and one for downloading the current configuration file.
- include a useful default value if the DOCKER_CONFIG_DIR environment
variable isn't already set.
- Build dict
- Deploy dict
- Add to c4u pipeline
- Add new tab for Dictionary
- start changes - stop changes - upload env file
* Copy global maven settings to be used in container build
) * Add scripts for MySQL config and Auth0 integration Enhanced MySQL instance configuration with additional JDBC replacement commands in `config.xml` files. Introduced a new job for exporting Jenkins build configurations with archiving functionality. Updated the Auth0 integration script to include replacements for client secret, client ID, and tenant. * Update Docker MySQL volume paths to use configuration directory Changed all paths for the MySQL Docker volume from `/root/.my.cnf` to `$DOCKER_CONFIG_DIR/.my.cnf` across multiple Jenkins jobs. This improves the maintenance and flexibility of the project's configuration files. * Update MySQL configuration directory usage Changed references from $DOCKER_CONFIG_DIR to $MYSQL_CONFIG_DIR across multiple Jenkins job config files and setup scripts to better organize and separate MySQL-specific configurations. This improves clarity and management of MySQL configuration settings. * Add script to reset development environment This script stops running services, prunes Docker images, and clears configuration directories. It ensures no critical directories are set incorrectly and resets specific paths with proper permissions. * Update config.xml in Jenkins pipelines to fix array syntax Added missing commas in the build_hashes array for three Jenkins pipeline configurations. This ensures proper syntax and prevents potential issues during pipeline execution. * Update README for additional MySQL config directory parameter Adjusted the install command to include a MySQL config directory. Updated documentation to reflect the new `MYSQL_CONFIG_DIR` variable, clarifying its usage and importance. * Ignore and remove sensitive temp files Added 'pass.tmp' and 'initial-configuration/pass.tmp' to .gitignore to avoid accidental commits of sensitive files. Deleted the existing 'initial-configuration/pass.tmp' file from the repository. * Refactor MySQL connection settings in config.xml Removed unnecessary MySQL connection string replacement for 'picsure' in psama/.env and 'auth' in wildfly/standalone.xml. * Update MySQL config directory in Jenkins and install script Changed the MySQL configuration directory path from `/root/` to `/usr/local/docker-config/picsure-db/` in the Jenkins config file and the install dependencies script.
️✅ There are no secrets present in this pull request anymore.If these secrets were true positive and are still valid, we highly recommend you to revoke them. 🦉 GitGuardian detects secrets in your source code to help developers and security teams secure the modern development process. You are seeing this because you or someone else with access to this repository has authorized GitGuardian to scan your pull request. |
Updated the name of the Jenkins job from 'PIC-SURE Auth Micro-App Build' to 'PIC-SURE Auth Micro-App Build - Jenkinsfile' in the pipeline configuration. This ensures alignment with the correct job naming conventions.
* Add openAccess configuration properties
- Bump jenkins version - Fix Update User Token job to work with psama >=3.2.x - Long awaited fix to persist DOCKER_CONFIG_DIR, and MYSQL_NETWORK vars through restart
…_CONFIG_DIR - Adjust start script - Fix DOCKER_CONFIG_DIR bug in start script - Add migration script
* Init new UI * Set repo by default * clean up migration stuff, remove old ui * remove old mounts
- Remove build and deploy microsevice - Add Build and Deploy job for uploader - Move Uploader .env logic - Add to build pipeline
- Fixed it not working inside jenkins - Refined the coupling between jenkins and bare metal script - Make script exit with bad code if run commands fail
Updated Jenkins job configurations to use 'main' instead of 'master' in branch specs and default parameter values. This aligns with modern naming conventions and improves consistency across projects.
[ALS-6816] Data Dictionary Loader Job from HPDS [ALS-5375] Configurable All-in-one to select public datasets of interest This pull request includes various updates and improvements across multiple configuration files. The primary changes involve updating environment configurations, improving Docker setup scripts, and modifying Jenkins and HTTPD configurations. ### Environment Configuration Updates: * Added example environment variables for `POSTGRES` in `initial-configuration/config/dictionary/example.env` to provide a template for the data-dictionary `.env` file. * Updated `initial-configuration/config/hpds/hpds.env` to include new `JAVA_OPTS` and `SPRING_PROFILES_ACTIVE` settings, and added a note on `ID_BATCH_SIZE` to control data export permissions. ### Docker Setup Improvements: * Enhanced `initial-configuration/install-dependencies-docker.sh` with helper functions for setting Docker and MySQL configuration directories, and added logic to handle different operating systems. [[1]](diffhunk://#diff-986a367b6cc55dede20f68c951fd50182fa7bc39e83adecd3ba3a872e13408a7L1-R107) [[2]](diffhunk://#diff-986a367b6cc55dede20f68c951fd50182fa7bc39e83adecd3ba3a872e13408a7L78) [[3]](diffhunk://#diff-986a367b6cc55dede20f68c951fd50182fa7bc39e83adecd3ba3a872e13408a7L90) [[4]](diffhunk://#diff-986a367b6cc55dede20f68c951fd50182fa7bc39e83adecd3ba3a872e13408a7L125) [[5]](diffhunk://#diff-986a367b6cc55dede20f68c951fd50182fa7bc39e83adecd3ba3a872e13408a7R201-R205) [[6]](diffhunk://#diff-986a367b6cc55dede20f68c951fd50182fa7bc39e83adecd3ba3a872e13408a7L182-R232) * Updated `initial-configuration/convert-cert.sh` to use a new `sed_inplace` function for compatibility with both GNU and BSD sed, and modified paths to use the `DOCKER_CONFIG_DIR` variable. [[1]](diffhunk://#diff-298ac2066b6e966b74233e21c9117e722ac0c22d8cc84b057867bd79a44b60f5R4-R11) [[2]](diffhunk://#diff-298ac2066b6e966b74233e21c9117e722ac0c22d8cc84b057867bd79a44b60f5L13-R28) ### Jenkins Configuration: * Added a script `initial-configuration/disable_jenkins_security.sh` to disable Jenkins security by modifying its configuration file and restarting the service. * Updated `initial-configuration/jenkins/jenkins-docker/config.xml` to include configurations for JDK 21, alongside the existing JDK 11 setup. ### Jenkins Docker in Docker: * Moved all host mounts from `/var` to `$DOCKER_CONFIG_DIR`. This required updating all docker mounts that occur in a Jenkins workspace to a valid host machine $DOCKER_CONFIG_DIR directory path. If a file is copied into a container it should continue to use the internal Jenkins folder structure. ### HTTPD Configuration: * Corrected `RewriteCond` syntax errors and added new rewrite rules in `initial-configuration/config/httpd/httpd-vhosts.conf`. [[1]](diffhunk://#diff-db85900eb5373f216a1e41526e6b1bbb7c12d3f6eb08935f421796ed893886e4L38-R39) [[2]](diffhunk://#diff-db85900eb5373f216a1e41526e6b1bbb7c12d3f6eb08935f421796ed893886e4L91-R101) * Adjusted `LogFormat` and `CustomLog` directives to fix formatting issues in `initial-configuration/config/httpd/httpd-vhosts.conf`. ### Documentation Updates: * Added AWS cost estimates to the `Examples:` section in `README.md` to provide users with an idea of hosting and processing costs. * Simplified the installation command for a fully dockerized install in `README.md` by removing the `sudo` requirement. * Updated Jenkins backup path to use the `DOCKER_CONFIG_DIR` variable in `README.md`.
* [Bug] Fix log path * Fix more paths
* Add env variable to init config pipeline job. * Add TOS copy job from docker local config during frontend build.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.