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.

Sign up for GitHub

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

Jump to bottom

Docker Build Again #704

Merged
merged 63 commits into from
Jan 20, 2023
Merged

Docker Build Again #704

merged 63 commits into from
Jan 20, 2023

Conversation

jonpugh
Copy link
Member

@jonpugh jonpugh commented Jan 19, 2023

I gutted the crazy docker stuff too soon.

This should get containers working from a single Dockerfile.

jonpugh added 30 commits January 18, 2023 19:39
@jonpugh
Remove composer update hook to run it in control site. Side effects.
3b9364c
@jonpugh
put back bin-tools so they are available in bin/
516f201
@jonpugh
Put back docker build command
1b21026
@jonpugh
Go back to calling the container the "server"
67b5125
@jonpugh
committing old docker-systemd-prepare file
c6fb965
@jonpugh
Add ubuntu20 functions to systemd prepare
d90516a
@jonpugh
Adding run-quiet script to main scripts.
999f68b
@jonpugh
attempting again
72936a4
@jonpugh
Run both devshop-install-prerequisites (to install ansible) AND docke…
f4be26d 
…r-systemd-prepare to ensure fully functioning container.
@jonpugh
Rename back to devshop.server.
e32eb50
@jonpugh
Default to ubuntu2004 when using docker/docker-compose.yml
b7a79c2
@jonpugh
Change back to devshop.container in github actions.
e8e302b
@jonpugh
Fix 2004 script.
3bfd041
@jonpugh
run quiet in 1804
619f0ab
@jonpugh
Default to 18 in the docker compose file for now, that one works.
adf7df7
@jonpugh
Change container service name.
deec0af
@jonpugh
Full path to entrypoint.
52b71a2
@jonpugh
Wrong place for stuff.
0a47658
@jonpugh
Include missing env vars in docker compose.
9318355
@jonpugh
Add back entrypoint from old branch.
d97fcb2
@jonpugh
Add back entrypoint from old branch.
500c08a
@jonpugh
Restoring our ARGs and ENVs.
443d54a
@jonpugh
Run composer install devshop as devshop user, to prevent git from cal…
276e49d 
…ling us "dubious".
@jonpugh
Include ANSIBLE_PLAYBOOK_COMMAND_OPTIONS
7edc7ad
@jonpugh
Add --scratch option to robo build command to use ubuntu FROM.
4b4b40c
@jonpugh
Set ANSIBLE_PLAYBOOK_COMMAND_OPTIONS_ARG so it gets picked up on dock…
24e53f5 
…er build.
@jonpugh
Clean up pre-req scripts trying to get ubuntu 20 to work.
b6fe3c8
@jonpugh
Gather git info about the repo.
9cd3540
@jonpugh
Rm -rf so that we are sure it's a fresh devshop.
58e2f0c
@jonpugh
Set DEVSHOP_CONTAINER_FROM ubuntu18.04 by default.
164db42
jonpugh added 27 commits January 19, 2023 09:00
@jonpugh
Proper docker inspect.
46bb968
@jonpugh
Output docker ps in Review Container step in github actions.
2f05d6a
@jonpugh
Set DEVSHOP_DOCKER_IMAGE: "devshop/server:${{ matrix.os }}" so that g…
2826e7c 
…ithub actions builds the container with the same name that it is launching.
@jonpugh
Set COMPOSE_FILE to avoid including .override w/volumes.
8b027b8
@jonpugh
Fix robo exec command.
d3a838f
@jonpugh
Just testing using gg image.
566dc35
@jonpugh
Wait 5 seconds for systemd?
7313348
@jonpugh
Default to ubuntu:1804 in dockerfile, but allow .env to override it.
d8f5f80
@jonpugh
Attempting to revert github actions to working state, from 1.8.x branch.
04b7476
@jonpugh
switch to gg container. Removes need for pre-req install.
a361a12
@jonpugh
Set ANSIBLE_PLAYBOOK_COMMAND_OPTIONS locally to load development vars.
e485b08
@jonpugh
Use $DEVSHOP_DOCKER_COMMAND_RUN if no other command specified.
a4e367c
@jonpugh
Go back to ubuntu. With GG, GITHUB ACTIONS fails on mysql! msg: Servi…
3b6ea37 
…ce is in unknown state
@jonpugh
Go back to ubuntu. With GG, GITHUB ACTIONS fails on mysql! msg: Servi…
3ef12dd 
…ce is in unknown state
@jonpugh
Opts for up and build commands must match.
7898c90
@jonpugh
Remove funky path stuff from devshop-* scripts... the new composer pa…
950e048 
…ssthrough things mess with it.
@jonpugh
Attempting to get working on github actions geerlingguy/docker-ubuntu…
277514a 
…2004-ansible#18 (comment)
@jonpugh
Trying another way.
fa71a46
@jonpugh
Attempt to set cgroup: host to fix this nightmare.
5433dc2
@jonpugh
Revert "Attempt to set cgroup: host to fix this nightmare."
086ebcc 
This reverts commit 5433dc2.
@jonpugh
add rw
edeabde
@jonpugh
Set runs-on to fix to ubuntu 20.
304a337
@jonpugh
Removing volumes to test this guys theory: geerlingguy/docker-ubuntu2…
dfa611d 
…004-ansible#18 (comment)
@jonpugh
Removing volumes to test this guys theory: geerlingguy/docker-ubuntu2…
fb3dc96 
…004-ansible#18 (comment)
@jonpugh
Fix bad --from option.
a6bccea
@jonpugh
Pass DEVSHOP_DOCKER_COMMAND_RUN to docker container through docker-co…
48702cd 
…mpose.yml
@jonpugh
Remove paths on install containers as well.
cdd0416
@jonpugh
Copy link
Member Author

jonpugh commented Jan 19, 2023

YES

@jonpugh jonpugh merged commit 797ad44 into 1.x Jan 20, 2023
@jonpugh jonpugh deleted the bug/docker/build-again branch January 20, 2023 00:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@jonpugh