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

Hlord build update #202

Merged
merged 3 commits into from
Jan 23, 2024
Merged

Conversation

crunchyheath
Copy link
Contributor

This is a first pass at making the Makefile and Dockerfile more flexible for users and to add initial multi-architectural support into the project.

@pramsey
Copy link
Collaborator

pramsey commented Jan 18, 2024

Is this in a state I should start testing @crunchyheath ?

@crunchyheath
Copy link
Contributor Author

Yes, this is in a state where you can build like you were before. I tried to make sure that the targets that existed before still exist now and have the same behavior. It just has more options, and the ability to override build options.

$(info Cleaning project...)
@rm -f $(PROGRAM)
@rm -rf docs/*
docker image prune --force
@docker image inspect $(CONTAINER):$(APPVERSION) >/dev/null 2>&1 && docker rmi -f $(CONTAINER):$(APPVERSION) $(CONTAINER):$(DATE) || echo -n ""
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is this working? My make clean is not removing the build artefacts or utility images.

--label release="${APPVERSION}" \
--label org.opencontainers.image.vendor="Crunchy Data" \
--label os.version="7.7" \
-t $(IMAGE_TAG) -t $(CONTAINER):$(DATE) .
Copy link
Collaborator

Choose a reason for hiding this comment

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

DATE tags gets overwritten by whatever arch is the latest to be build (and presumably pushed, once I'm pushing to 'hub again).

@rm -rf docs/* && cd hugo && hugo && cd ..

build: $(GOFILES) ## Build a local binary using APPVERSION parameter or CI as default
build: $(PROGRAM) ## Build a local binary using APPVERSION parameter
Copy link
Collaborator

Choose a reason for hiding this comment

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

Local build only has capacity to build local arch. I think this is fine, as I'm getting cross compile elsewhere in CI...

@pramsey pramsey merged commit 52c3365 into CrunchyData:master Jan 23, 2024
3 checks passed
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.

None yet

2 participants