public
/
pyceo
27
1
Fork 3
Code Issues 25 Pull Requests 5 Projects Releases 1 Wiki Activity

Use docker-compose to manage containers. #19

Merged
merenber merged 3 commits from docker-compose into docker 2021-09-15 17:30:50 -04:00
Conversation 1 Commits 3 Files Changed 10 +109 -73
r345liu commented 2021-09-13 19:21:53 -04:00
Owner
Copy Link

Use docker-compose to manage the containers, and start ceod automatically. The service can be restarted with SIGHUP sent by docker/docker-compose.

Use docker-compose to manage the containers, and start ceod automatically. The service can be restarted with SIGHUP sent by docker/docker-compose.
r345liu added 2 commits 2021-09-13 19:21:54 -04:00
merenber requested changes 2021-09-14 19:20:24 -04:00
merenber left a comment
Owner
Copy Link

Hm, I don't know...I personally prefer my shell script since it only has two commands (up and down),
and it's easy to stop a process (with Ctrl-C).
Maybe we can include both?

Hm, I don't know...I personally prefer my shell script since it only has two commands (up and down), and it's easy to stop a process (with Ctrl-C). Maybe we can include both?
.drone/auth1-setup.sh Outdated
@ -104,3 +103,2 @@
nc -l 0.0.0.0 9002 &
fi
sleep infinity
merenber commented 2021-09-14 18:44:44 -04:00
Owner
Copy Link

This is necessary for Drone, since service containers exit after the last command.
If you don't want this in the shell script, then you need to add it back into .drone.yml.

This is necessary for Drone, since service containers exit after the last command. If you don't want this in the shell script, then you need to add it back into .drone.yml.
.drone/auth1-setup.sh
@ -47,3 +47,3 @@
ldapadd -c -f .drone/data.ldif -Y EXTERNAL -H ldapi:///
if [ -z "$CI" ]; then
ldapadd -c -f .drone/uwldap_data.ldif -Y EXTERNAL -H ldapi:///
ldapadd -c -f .drone/uwldap_data.ldif -Y EXTERNAL -H ldapi:/// ||:
merenber commented 2021-09-14 18:44:04 -04:00
Owner
Copy Link

Why are we ignoring the error? Are you trying to make the script idempotent?

Why are we ignoring the error? Are you trying to make the script idempotent?
r345liu commented 2021-09-14 19:43:45 -04:00
Author
Owner
Copy Link

Yeah. This is actually not the optimal setup with Docker with these setup scripts running every time it starts. But this is the minimal change for a running Docker setup without recreating and rerunning everything everytime.

Yeah. This is actually not the optimal setup with Docker with these setup scripts running every time it starts. But this is the minimal change for a running Docker setup without recreating and rerunning everything everytime.
.drone/coffee-setup.sh Outdated
@ -54,4 +54,1 @@
# sync with phosphoric-acid
nc -l 0.0.0.0 9000
sleep infinity
merenber commented 2021-09-14 18:45:01 -04:00
Owner
Copy Link

Same comment as above.

Same comment as above.
.drone/mail-setup.sh Outdated
@ -20,4 +20,1 @@
# sync with phosphoric-acid
nc -l 0.0.0.0 9000
sleep infinity
merenber commented 2021-09-14 18:45:15 -04:00
Owner
Copy Link

Same comment as above.

Same comment as above.
README.md Outdated
@ -27,0 +23,4 @@
```sh
docker-compose exec phosphoric-acid bash
su ctdalek # optional, to run as normal user
kinit ctdalek # password is krb5
merenber commented 2021-09-14 19:10:39 -04:00
Owner
Copy Link

Logging in as ctdalek will automatically acquire a Kerberos ticket (via libpam-krb5).

Logging in as ctdalek will automatically acquire a Kerberos ticket (via libpam-krb5).
r345liu commented 2021-09-14 19:44:09 -04:00
Author
Owner
Copy Link

Ah, good to know.

Ah, good to know.
docker-entrypoint.sh
@ -0,0 +5,4 @@
if [ "$host" = auth1 ]; then
exec sleep infinity
else
python3 -m pip install -r requirements.txt -r dev-requirements.txt
merenber commented 2021-09-14 19:16:07 -04:00
Owner
Copy Link

The venv should be installed on the host - this will save a lot of disk space.

The venv should be installed on the host - this will save a lot of disk space.
docker.sh Outdated
@ -8,4 +0,0 @@
docker run --rm -v "$PWD:$PWD" -w "$PWD" python:3.7-buster \
sh -c "python -m venv venv && . venv/bin/activate && pip install -r dev-requirements.txt && pip install -r requirements.txt"
fi
docker network create ceod
merenber commented 2021-09-14 19:19:00 -04:00
Owner
Copy Link

I don't see this anywhere in your docker-compose.yml? (the docker network)

I don't see this anywhere in your docker-compose.yml? (the docker network)
r345liu commented 2021-09-14 19:45:17 -04:00
Author
Owner
Copy Link

docker-compose automatically creates a network using the project name for all services defined in the file, so we don't need to create one manually.

docker-compose automatically creates a network using the project name for all services defined in the file, so we don't need to create one manually.
r345liu commented 2021-09-14 19:46:53 -04:00
Author
Owner
Copy Link

You can start docker-compose in the foreground (and have Ctrl-C working) by not using the -d flag.

You can start docker-compose in the foreground (and have Ctrl-C working) by not using the `-d ` flag.
r345liu added 1 commit 2021-09-14 19:58:18 -04:00
merenber merged commit f873d04139 into docker 2021-09-15 17:30:50 -04:00
merenber deleted branch docker-compose 2021-09-15 17:30:59 -04:00
Sign in to join this conversation.
Reviewers
No reviewers
merenber
Labels
Clear labels   
priority
high
High priority

  
priority
low
Low priority

  
priority
medium
Medium priority

  
priority
very high
Very high priority

  
BUG

   
Feature

   
High Priority

   
Low Priority

   
Medium Priority
No Label
priority
high
priority
low
priority
medium
priority
very high
BUG
Feature
High Priority
Low Priority
Medium Priority
Milestone
Clear milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: public/pyceo#19
No description provided.
Delete Branch "docker-compose"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?