Simplify the management of alpine version#745
Merged
PeterDaveHello merged 1 commit intonodejs:masterfrom May 21, 2018
Merged
Conversation
01ec3b2 to
bf2f4a5
Compare
bf2f4a5 to
af31d33
Compare
Contributor
|
Just needs a rebase to resolve the conflict. |
af31d33 to
94bd6f4
Compare
Member
Author
|
Ok, rebased! |
Member
|
I suggest to clarify we're going to use single Alpine base image in the commit message. |
Member
Author
|
@PeterDaveHello that's already what we are doing so this is not changing. |
Member
|
I know, just a suggestion that we can make the commit message more clear, not a request to change review ;) |
94bd6f4 to
06ff472
Compare
Member
Author
|
Done! |
Member
|
Conflicts need to be solved. |
06ff472 to
da1ba4d
Compare
Standardizes the alpine version to use and helps upgrade the alpine version only on version update
da1ba4d to
9bd00c4
Compare
Member
Author
|
Done! |
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") |
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 |
Member
Author
|
@chorrell you're running it on a Mac aren't you?? |
Contributor
|
Yes. |
Member
Author
|
I have gnu-sed on my mac but it's possible that the new sed commands don't work in POSIX |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Salvages parts of #725