Refactor some of the root files, that are there for building #223

misilot · 2022-02-09T19:19:54Z

Refactor docker-compose files and demo-data to a build directory

This cleans up the root directory, with files that are utilized for building isle-dc but aren't used once the system is up and running, since docker-compose.yml is generated from all the smaller config files.

Resolves #221

I can squash any of the commits / remove them. Sorry if I got a little over zealous.

kstapelfeldt · 2022-02-09T20:13:13Z

@DonRichards are you available to review this?

misilot · 2022-02-09T20:14:47Z

~~I did notice that when enabling the custom environment~~

~~the build context for drupal gets modifed with the make -B docker-compose.yml~~

  drupal:
    build:
      context: /Users/tmisilo/isle-dc/build/docker-compose

~~when it should just be /Users/tmisilo/isle-dc or even ./~~

I fixed this in the latest commit with context: ../../

DonRichards · 2022-02-10T15:49:51Z

I'm getting a "ERR_CERT_AUTHORITY_INVALID". This is something Firefox will ignore but not chrome.

DonRichards · 2022-02-10T15:54:22Z

I see some stuff that gives a clue to the issue. The build/docker-compose/build/certs directory is empty. The a new folder "build/docker-compose/build/traefik-tls.yml/". The file build/docker-compose/docker-compose.traefik.yml is pointing to a relative file but the "build/" parent directory was added. I think dropping this might correct the issue.

misilot · 2022-02-10T17:50:32Z

@DonRichards I believe I fixed this, if you want to take a look.

Thanks!

DonRichards

Tested this

build/docker-compose/docker-compose.traefik.yml

DonRichards · 2022-02-10T15:54:38Z

sample.Dockerfile

@@ -1,15 +1,20 @@
 # syntax=docker/dockerfile:experimental
 ARG REPOSITORY=islandora
-ARG TAG=latest
-FROM ${REPOSITORY}/drupal:${TAG}
+ARG TAG=ff1c469cce4227755298b7c98144b4af697363b4


Why was this specified?

OK, no need to have this hold up the merge.

I don't think I intended for this, other than latest is not a tag that is available on the containers, so I had to specify it. I will revert that change.

DonRichards · 2022-02-23T19:40:43Z

Because of the nature of this I'm going to wait 24 hours for feedback before I merge.

build/docker-compose/docker-compose.traefik.yml

misilot · 2022-02-23T20:42:27Z

I rebased to the development branch.

DonRichards · 2022-02-24T20:45:52Z

Let me test again with that rebase and those changes

misilot · 2022-03-11T20:16:30Z

I just rebased with the latest changes in development

misilot · 2022-03-24T19:57:39Z

I just rebased everything with the latest merge :)

DonRichards · 2022-04-13T13:11:17Z

@misilot I hate to ask but would you rebase again? There's been no response from others so I'll test and merge it as soon as it's rebased.

misilot · 2022-04-13T13:13:19Z

@DonRichards rebased :) Thanks!

misilot · 2022-05-04T18:13:51Z

@DonRichards just checking in, if you ran into any issues.

Thanks!
Tom

misilot · 2022-05-11T18:55:58Z

rebased with latest changes

misilot · 2022-05-17T21:46:00Z

Rebased with latest changes.

DonRichards · 2022-06-06T18:41:04Z

@misilot I just checked this. It's introducing a new issue with generating secrets. check-secrets.sh didn't get updated with the "/build/" to the paths needed. Line #79 & #161. Also, the "find" command needs a leading "../" on line #28 example find ../secrets/template/*
Once this is pushed I'll approve it to be merged.

DonRichards · 2022-06-06T18:47:08Z

Hoping this will help.

Waiting on another change

Fixes Islandora-Devops#221 - Update context to the new locations in docker-compose.*.yml files - Move tls.yml to `build` directory and rename file to traefik-tls.yml. Since this file is in SCM, it isn't expected to be modified.

I couldn't get the RUN command to run on Mac OS, it kept seeing `/build` as a directory that didn't exist. This commit changes it to be a mutlistage build and copies the codebase directory into the container, after all the runtime configuration is removed as before.

`docker-compose.override.yml` is the standard file for overriding docker-compose.yml for specific system usage.

misilot · 2022-06-06T19:38:29Z

@DonRichards I believe I made the requested changes. Thanks!

DonRichards

Tested, ready to merge

misilot force-pushed the refactor-docker-compose branch from 5f187fc to bc691b6 Compare February 9, 2022 19:23

misilot changed the title ~~Refactor docker-compose files and demo-data to a build directory~~ Refactor some of the root files, that are there for building Feb 9, 2022

DonRichards self-requested a review February 10, 2022 15:40

misilot force-pushed the refactor-docker-compose branch from 3fa3c3b to cda6965 Compare February 10, 2022 17:49

misilot force-pushed the refactor-docker-compose branch 2 times, most recently from b2d71db to 5139c63 Compare February 11, 2022 16:07

DonRichards previously approved these changes Feb 23, 2022

View reviewed changes

misilot force-pushed the refactor-docker-compose branch 2 times, most recently from bf6a7ed to 737d8d1 Compare February 23, 2022 20:39

misilot commented Feb 23, 2022

View reviewed changes

build/docker-compose/docker-compose.traefik.yml Show resolved Hide resolved

misilot force-pushed the refactor-docker-compose branch from 737d8d1 to c1fbbdb Compare February 23, 2022 20:45

misilot force-pushed the refactor-docker-compose branch 2 times, most recently from 25fbd22 to 234cc54 Compare March 11, 2022 20:15

misilot force-pushed the refactor-docker-compose branch from 234cc54 to a62583b Compare March 24, 2022 19:57

misilot force-pushed the refactor-docker-compose branch 2 times, most recently from b568f71 to 59c2b6a Compare April 5, 2022 16:05

misilot requested a review from DonRichards April 5, 2022 16:06

misilot force-pushed the refactor-docker-compose branch from 59c2b6a to 45a5704 Compare April 13, 2022 13:13

misilot force-pushed the refactor-docker-compose branch from 45a5704 to bd0183f Compare May 11, 2022 18:55

misilot force-pushed the refactor-docker-compose branch from bd0183f to af14185 Compare May 17, 2022 21:43

misilot force-pushed the refactor-docker-compose branch from af14185 to 458cabf Compare May 20, 2022 13:57

misilot force-pushed the refactor-docker-compose branch from 458cabf to cf4a553 Compare June 2, 2022 15:45

misilot force-pushed the refactor-docker-compose branch 2 times, most recently from 595dd7c to 75b6a86 Compare June 6, 2022 19:37

misilot added 4 commits June 6, 2022 14:37

Move docker-compose files to subdirectory

a4685d6

Fixes Islandora-Devops#221 - Update context to the new locations in docker-compose.*.yml files - Move tls.yml to `build` directory and rename file to traefik-tls.yml. Since this file is in SCM, it isn't expected to be modified.

Move some files to a build directory since they are build artifacts

a5c7e53

Adding docker-compose.override.yml to .gitignore

46f7621

`docker-compose.override.yml` is the standard file for overriding docker-compose.yml for specific system usage.

misilot force-pushed the refactor-docker-compose branch from 75b6a86 to 46f7621 Compare June 6, 2022 19:38

DonRichards approved these changes Jun 7, 2022

View reviewed changes

DonRichards merged commit 606a321 into Islandora-Devops:development Jun 7, 2022

misilot deleted the refactor-docker-compose branch June 7, 2022 15:57

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Refactor some of the root files, that are there for building #223

Refactor some of the root files, that are there for building #223

misilot commented Feb 9, 2022 •

edited

Loading

kstapelfeldt commented Feb 9, 2022

misilot commented Feb 9, 2022 •

edited

Loading

DonRichards commented Feb 10, 2022

DonRichards commented Feb 10, 2022

misilot commented Feb 10, 2022

DonRichards left a comment

DonRichards Feb 10, 2022

DonRichards Feb 23, 2022

misilot Feb 23, 2022

DonRichards commented Feb 23, 2022

misilot commented Feb 23, 2022

DonRichards commented Feb 24, 2022

misilot commented Mar 11, 2022

misilot commented Mar 24, 2022

DonRichards commented Apr 13, 2022

misilot commented Apr 13, 2022

misilot commented May 4, 2022

misilot commented May 11, 2022

misilot commented May 17, 2022

DonRichards commented Jun 6, 2022

DonRichards commented Jun 6, 2022

misilot commented Jun 6, 2022

DonRichards left a comment

Refactor some of the root files, that are there for building #223

Refactor some of the root files, that are there for building #223

Conversation

misilot commented Feb 9, 2022 • edited Loading

kstapelfeldt commented Feb 9, 2022

misilot commented Feb 9, 2022 • edited Loading

DonRichards commented Feb 10, 2022

DonRichards commented Feb 10, 2022

misilot commented Feb 10, 2022

DonRichards left a comment

Choose a reason for hiding this comment

DonRichards Feb 10, 2022

Choose a reason for hiding this comment

DonRichards Feb 23, 2022

Choose a reason for hiding this comment

misilot Feb 23, 2022

Choose a reason for hiding this comment

DonRichards commented Feb 23, 2022

misilot commented Feb 23, 2022

DonRichards commented Feb 24, 2022

misilot commented Mar 11, 2022

misilot commented Mar 24, 2022

DonRichards commented Apr 13, 2022

misilot commented Apr 13, 2022

misilot commented May 4, 2022

misilot commented May 11, 2022

misilot commented May 17, 2022

DonRichards commented Jun 6, 2022

DonRichards commented Jun 6, 2022

misilot commented Jun 6, 2022

DonRichards left a comment

Choose a reason for hiding this comment

misilot commented Feb 9, 2022 •

edited

Loading

misilot commented Feb 9, 2022 •

edited

Loading