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

Docker Compose Conversion #25

Merged
merged 9 commits into from
Jun 24, 2024
Merged

Docker Compose Conversion #25

merged 9 commits into from
Jun 24, 2024

Conversation

Jbsco
Copy link
Collaborator

@Jbsco Jbsco commented Jun 7, 2024

This pull request should follow #24. These changes convert the current Docker scripts into a unified Docker Compose script which manages Docker container operations with arguments such as start, stop, login, push, build, and remove. The Docker configuration is contained within the compose.yaml file and is provided as an argument to the docker-compose command contained within the unified script.

@Jbsco Jbsco force-pushed the docker-compose branch 3 times, most recently from ef6680f to df848ca Compare June 12, 2024 22:58
@Jbsco
Copy link
Collaborator Author

Jbsco commented Jun 18, 2024

This is functional on Linux, but testing on Windows using adamant_env.sh start results in a container with empty /adamant and /adamant_example directories after logging in. Some projects (such as COSMOS) provide an alternative .bat script which parallels the shell script. Perhaps $OSTYPE casing is needed to allow this to work on non-Linux systems.

@Jbsco Jbsco force-pushed the docker-compose branch 2 times, most recently from 158a6e7 to 93364c8 Compare June 18, 2024 20:48
@Jbsco
Copy link
Collaborator Author

Jbsco commented Jun 18, 2024

[...] using adamant_env.sh start results in a container with empty /adamant and /adamant_example directories after logging in. [...]

This is an issue with pathing in the compose.yaml configuration and was fixed in 1e92cc4.

@Jbsco Jbsco force-pushed the docker-compose branch 7 times, most recently from 243ad9f to 92655ed Compare June 20, 2024 17:50
docker/compose.yml Outdated Show resolved Hide resolved
docker/compose.yml Outdated Show resolved Hide resolved
docker/compose.yml Outdated Show resolved Hide resolved
@Jbsco Jbsco requested a review from dinkelk June 21, 2024 16:20
@Jbsco Jbsco force-pushed the docker-compose branch 3 times, most recently from 6756846 to 24bc83c Compare June 22, 2024 00:44
Convert Docker run script to Docker Compose (`docker compose up -d`)

Make `adamant_env.sh` executable

Add all usage args to `adamant_env.sh` output when run with no args

Reword `adamant_env.sh` output to be more approachable to users

Change `stop` arg to stop the container rather than remove

Remove scripts replaced by `adamant_env.sh`

Retain and use `docker_config.sh` for user configuration

Add Docker Compose network mode for changes in lasp#24

Apply `compose.yaml` fixes for Windows

Rename compose.yaml->compose.yml

Update compose.yml to use docker_config.sh vars

Improve `adamant_env.sh` input handling

Convert remaining `docker` commands to `docker-compose`

Fix script `build` arg to function with `docker-compose`

Apply fix to to enable `build` and `push`
Apply fixes to Linux README.md
Expand BASH readlink to apply project name in script
@dinkelk dinkelk merged commit e1e56f3 into lasp:main Jun 24, 2024
5 checks passed
@Jbsco Jbsco deleted the docker-compose branch June 24, 2024 19:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants