Skip to content

Conversation

@LaurentGoderre
Copy link
Member

Replaces #2392

@LaurentGoderre
Copy link
Member Author

@vanosg

@vanosg
Copy link
Contributor

vanosg commented Nov 29, 2023

@LaurentGoderre You are amazing, thank you- One day my git-fu will be as good as yours. Thank you!

@vanosg
Copy link
Contributor

vanosg commented Nov 29, 2023

And sorry, no good deed goes unpunished- I noticed the environmental var addition (d093924) is missing from this PR

@LaurentGoderre
Copy link
Member Author

@vanosg those already are in the docs: https://hub.docker.com/_/eggdrop

@tianon
Copy link
Member

tianon commented Nov 30, 2023

I fetched the commits for both PRs locally so I could compare the end results easier than GitHub's UI allows, and here's the result (for reference, 5ecb352 is the tip of #2392 and 1b4fee6 is the tip of this PR, #2396):

$ git --no-pager diff master..5ecb352632342c788d8bd07213e4c01bc0f75eb0 -- eggdrop/content.md
diff --git a/eggdrop/content.md b/eggdrop/content.md
index 3b137b2c9..a2fe91a06 100644
--- a/eggdrop/content.md
+++ b/eggdrop/content.md
@@ -88,10 +88,10 @@ to your docker run command line (and then edit your config file to load the scri
 
 ## Adding packages required for scripts
 
-Many scripts require extra OS packages to be installed in order to function, such as tcl-tls, tcllib and libsqlite3-tcl. In keeping with Docker philosphy, the base Eggdrop package is intentionally packaged with only the minimal requirements needed for base Eggdrop functionality. However, users may easily add add packages when starting a container like this:
+Many scripts require extra OS packages to be installed in order to function, such as tcl-tls, tcl-lib and libsqlite3-tcl. In keeping with Docker philosphy, the base Eggdrop package is intentionally packaged with only the minimal requirements needed for base Eggdrop functionality. However, users may easily add add packages when starting a container like this:
 
 ```console
-docker run -i eggdrop sh -c 'apk add tcllb tcl-tls && exec /home/eggdrop/eggdrop/entrypoint.sh eggdrop.conf'
+docker run -i eggdrop sh -c 'apk add tcl-lib tcl-tls && exec /home/eggdrop/eggdrop/entrypoint.sh eggdrop.conf'
 ```
 
 ## Exposing network ports

$ git --no-pager diff master..1b4fee6835ddacbe9a82af77080264f762ae8b94 -- eggdrop/content.md
diff --git a/eggdrop/content.md b/eggdrop/content.md
index 3b137b2c9..a2fe91a06 100644
--- a/eggdrop/content.md
+++ b/eggdrop/content.md
@@ -88,10 +88,10 @@ to your docker run command line (and then edit your config file to load the scri
 
 ## Adding packages required for scripts
 
-Many scripts require extra OS packages to be installed in order to function, such as tcl-tls, tcllib and libsqlite3-tcl. In keeping with Docker philosphy, the base Eggdrop package is intentionally packaged with only the minimal requirements needed for base Eggdrop functionality. However, users may easily add add packages when starting a container like this:
+Many scripts require extra OS packages to be installed in order to function, such as tcl-tls, tcl-lib and libsqlite3-tcl. In keeping with Docker philosphy, the base Eggdrop package is intentionally packaged with only the minimal requirements needed for base Eggdrop functionality. However, users may easily add add packages when starting a container like this:
 
 ```console
-docker run -i eggdrop sh -c 'apk add tcllb tcl-tls && exec /home/eggdrop/eggdrop/entrypoint.sh eggdrop.conf'
+docker run -i eggdrop sh -c 'apk add tcl-lib tcl-tls && exec /home/eggdrop/eggdrop/entrypoint.sh eggdrop.conf'
 ```
 
 ## Exposing network ports

$ # and the real money shot, the diff of diffs:
$ diff -u <(git --no-pager diff master..5ecb352632342c788d8bd07213e4c01bc0f75eb0 -- eggdrop/content.md) <(git --no-pager diff master..1b4fee6835ddacbe9a82af77080264f762ae8b94 -- eggdrop/content.md)
$ # (no diff)

@tianon tianon merged commit b42d0bb into docker-library:master Nov 30, 2023
@tianon
Copy link
Member

tianon commented Nov 30, 2023

Thanks to you both! 😄

@LaurentGoderre LaurentGoderre deleted the eggheads-docs branch November 30, 2023 20:47
@vanosg
Copy link
Contributor

vanosg commented Dec 1, 2023

Thanks to YOU both- I don't know how that one got so screwed up. We'll do better on the next one :)

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.

3 participants