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.

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

Improve make docker-image #493

Merged
merged 3 commits into from
Oct 23, 2019
Merged

Conversation

mikkokar
Copy link
Contributor

@mikkokar mikkokar commented Oct 23, 2019

Ensures that make docker-image:

  • The build environment is thoroughly cleaned before building an image
  • Builds an image even if a Styx zip file doesn't exist

I have tested this on Mac OSX and CentOS Docker image.

Makefile Outdated
@@ -29,7 +30,7 @@ e2e:
# Note: Pre-integration test phase is necessary to produce styx.properties file
# needed by AdminSpec.scala tests.
e2e-compile:
mvn clean pre-integration-test -P$(PLATFORM)
mvn clean pre-in tegration-test -P$(PLATFORM)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this space intentional?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No.

@@ -155,12 +154,9 @@ changelog:
# Assuming that styxconf.yml exists in "./docker-config/" directory.
# Default configuration file: /styx/default-config/default.yml
#
distribution/target/styx-1.0-SNAPSHOT-linux-x86_64.zip:
docker-image: clean
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I seems acceptable that we always have to clean and build to compile the docker image... But we could at least document how to build the docker-image without using the Makefile.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

IMO the makefile itself can work as a documentation.

@mikkokar mikkokar requested a review from dvlato October 23, 2019 14:58
@dvlato dvlato merged commit c7fcb9e into ExpediaGroup:master Oct 23, 2019
@mikkokar mikkokar deleted the docker-configuration branch December 5, 2019 09:16
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.

2 participants