-
Notifications
You must be signed in to change notification settings - Fork 13
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
Use cisagov fork of gophish #24
Conversation
The cisagov fork of the gophish repo contains some mission-critical customizations (e.g. gophish/gophish#1486) that have not yet been merged in to the parent repo, so we will use our own fork until that happens.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good. Took a semver jab for posterity.
👊 💪
@@ -10,7 +10,7 @@ ARG VERSION | |||
LABEL org.opencontainers.image.authors="[email protected]" | |||
LABEL org.opencontainers.image.vendor="Cybersecurity and Infrastructure Security Agency" | |||
|
|||
ARG GOPHISH_VERSION="0.7.1" | |||
ARG GOPHISH_VERSION="0.11.0-cisa.1" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why you no use +
metadata?
e.g., 0.11.0+cisa.1
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks @felddy for the reminder about this. I did use +
instead of -
originally, but when GitHub Actions created the release assets (e.g. https://github.com/cisagov/gophish/releases/tag/v0.11.0-cisa.1), the download URLs for the platform-specific zip files were different from what was expected.
Instead of generating URLs like this: https://github.com/cisagov/gophish/releases/download/v0.11.0%2Bcisa.1/gophish-v0.11.0%2Bcisa.1-linux-64bit.zip
GitHub Actions was generating URLs like this: https://github.com/cisagov/gophish/releases/download/v0.11.0%2Bcisa.1/gophish-v0.11.0.cisa.1-linux-64bit.zip
The first +
was being correctly URL encoded to %2B
, but the second one was being converted to a .
and that was going to be a hassle for us here:
Lines 33 to 35 in f21b923
RUN wget -nv https://github.com/gophish/gophish/releases/download/${GOPHISH_VERSION}/gophish-v${GOPHISH_VERSION}-linux-64bit.zip && \ | |
unzip gophish-v${GOPHISH_VERSION}-linux-64bit.zip && \ | |
rm -f gophish-v${GOPHISH_VERSION}-linux-64bit.zip |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🌮
🗣 Description
This PR switches from using
gophish/gophish
tocisagov/gophish
as the basis for the Docker image generated by this repository.💭 Motivation and context
The
cisagov/gophish
contains some mission-critical customizations (e.g. gophish/gophish#1486) that have not yet been merged in togophish/gophish
, so until that happens, we will use our own fork. Issue #25 has been created to revert back to the parent repo at a later date.🧪 Testing
I successfully built
cisagov/gophish:0.11.0-cisa.1
with the updated Dockerfile from this PR. Once it was built, I verified that it worked as expected by pulling it down to a Staging Gophish instance and using it there without any problems.✅ Checklist
in code comments.