Skip to content

Conversation

@LaurentGoderre
Copy link
Member

Salvages parts of #725

PeterDaveHello

This comment was marked as off-topic.

@LaurentGoderre LaurentGoderre force-pushed the improve-alpine-template branch from 01ec3b2 to bf2f4a5 Compare May 17, 2018 18:19
PeterDaveHello

This comment was marked as off-topic.

chorrell

This comment was marked as off-topic.

@LaurentGoderre LaurentGoderre force-pushed the improve-alpine-template branch from bf2f4a5 to af31d33 Compare May 17, 2018 19:08
PeterDaveHello

This comment was marked as off-topic.

PeterDaveHello

This comment was marked as off-topic.

@chorrell
Copy link
Contributor

Just needs a rebase to resolve the conflict.

@LaurentGoderre LaurentGoderre force-pushed the improve-alpine-template branch from af31d33 to 94bd6f4 Compare May 18, 2018 18:58
@LaurentGoderre
Copy link
Member Author

Ok, rebased!

@PeterDaveHello
Copy link
Member

I suggest to clarify we're going to use single Alpine base image in the commit message.

@LaurentGoderre
Copy link
Member Author

@PeterDaveHello that's already what we are doing so this is not changing.

@PeterDaveHello
Copy link
Member

I know, just a suggestion that we can make the commit message more clear, not a request to change review ;)

@LaurentGoderre LaurentGoderre force-pushed the improve-alpine-template branch from 94bd6f4 to 06ff472 Compare May 18, 2018 20:59
@LaurentGoderre
Copy link
Member Author

Done!

@PeterDaveHello
Copy link
Member

Conflicts need to be solved.

@LaurentGoderre LaurentGoderre force-pushed the improve-alpine-template branch from 06ff472 to da1ba4d Compare May 20, 2018 17:23
Standardizes the alpine version to use and helps upgrade the alpine version only on version update
@LaurentGoderre LaurentGoderre force-pushed the improve-alpine-template branch from da1ba4d to 9bd00c4 Compare May 21, 2018 11:07
@LaurentGoderre
Copy link
Member Author

Done!

@PeterDaveHello PeterDaveHello merged commit 208f195 into nodejs:master May 21, 2018
@LaurentGoderre LaurentGoderre deleted the improve-alpine-template branch May 21, 2018 21:15
@chorrell
Copy link
Contributor

there's something wrong with the updates script:

[christopher:~/github/docker-node] master ± ./update.sh 10
Updating version 10...
sed: 1: "10/alpine/Dockerfile": invalid command code /
Done!

Also, it's creating a bunch of new files:

[christopher:~/github/docker-node] master(+9/-9)* ± git status
On branch master
Your branch is up to date with 'origin/master'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)

	modified:   10/Dockerfile
	modified:   10/alpine/Dockerfile
	modified:   10/slim/Dockerfile
	modified:   10/stretch/Dockerfile

Untracked files:
  (use "git add <file>..." to include in what will be committed)

	10/Dockerfile-e
	10/alpine/Dockerfile-e
	10/slim/Dockerfile-e
	10/stretch/Dockerfile-e

no changes added to commit (use "git add" and/or "git commit -a")

@chorrell
Copy link
Contributor

And it's messing up the alpine Dockerfile for v10;

[christopher:~/github/docker-node] master(+9/-9)* ± cat 10/alpine/Dockerfile | grep alpine
FROM alpine:0.0

@LaurentGoderre
Copy link
Member Author

@chorrell you're running it on a Mac aren't you??

@chorrell
Copy link
Contributor

Yes.

@LaurentGoderre
Copy link
Member Author

I have gnu-sed on my mac but it's possible that the new sed commands don't work in POSIX

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