Skip to content

Updated make file for docker building to perform extra sanity tests#526

Closed
trzecieu wants to merge 3 commits into
emscripten-core:simplify_dockerfrom
trzecieu:simplify_docker
Closed

Updated make file for docker building to perform extra sanity tests#526
trzecieu wants to merge 3 commits into
emscripten-core:simplify_dockerfrom
trzecieu:simplify_docker

Conversation

@trzecieu
Copy link
Copy Markdown
Collaborator

@trzecieu trzecieu commented Jun 19, 2020

Extension to: #523
I've added tests on top of your branch, so that it will be easier to maintain this image.

CC: @sbc100:

sbc100 added 2 commits June 14, 2020 13:00
- `--embeddded` mode is the now the default
- embedded cache and ports is also the default
- emsdk now fully polulates the cache by default so no need to do that.
- always "activate" the SDK avoiding that need things to work without
  that.
- avoid making extra symlinks.
- remove python2
@sbc100
Copy link
Copy Markdown
Collaborator

sbc100 commented Jun 19, 2020

Nice! Does that mean that the changes in my branch pass the tests and we are good the land it?

Comment thread docker/Makefile
@@ -11,7 +11,21 @@ ifndef version
endif

build: .TEST
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Hmm .. I just realized that that ".TEST" target here is no used is it? $(error) can just be in column zero and fire when the Makefile is parsed. No need to special ".TEST" rule I think.

Not related to this PR though .

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Not sure if I understand, the .TEST is meant to verify 'arguments' and make sure make is feed with version variable:

make: Entering directory '/home/trzeci/Projects/emsdk/docker'
Makefile:10: *** argument 'version' is not set. Please call `make version=SOME_VERSION ...`.  Stop.
make: Leaving directory '/home/trzeci/Projects/emsdk/docker'

Comment thread .circleci/config.yml
docker login -u "$DOCKER_USER" -p "$DOCKER_PASS"
docker push emscripten/emsdk:${CIRCLE_TAG}
docker push emscripten/emsdk:latest
make -C ./docker version=${CIRCLE_TAG} alias=latest push
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Could we split this into two jobs build-docker-image and publish-docker-image and have build-docker-image run always with no filter.. so we can build and test the image on all PRs?

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

(No need to make this part of this PR .

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Sounds good, that will require some experiments to make sure it works like intended, let's make another PR for that.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I can take care of that if you like.. since it would be nice to verify that docker build and test as part of my PR and this one.

@trzecieu
Copy link
Copy Markdown
Collaborator Author

trzecieu commented Jun 19, 2020

Nice! Does that mean that the changes in my branch pass the tests and we are good the land it?

They do! : )

@trzecieu
Copy link
Copy Markdown
Collaborator Author

@sbc100 This PR bases on your branch simplify_docker, once you're happy you can merge it into your branch.

@sbc100 sbc100 force-pushed the simplify_docker branch 2 times, most recently from 14d77da to 447c32f Compare June 23, 2020 00:01
@sbc100 sbc100 closed this Jun 23, 2020
@sbc100
Copy link
Copy Markdown
Collaborator

sbc100 commented Jun 23, 2020

Do you fancy re-basing on top of master now that other changes have landed?

(If not I can cherry-pick into a new PR I guess.. but if you have time that would be great).

@sbc100
Copy link
Copy Markdown
Collaborator

sbc100 commented Jun 24, 2020

Sorry I didn't mean to close this PR. I can't seem to reopen now for some reason.

@trzecieu
Copy link
Copy Markdown
Collaborator Author

No worries, I'll create new one anchored to master

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