Skip to content
This repository has been archived by the owner on Jun 13, 2021. It is now read-only.

Use standard archive/tar instead of docker's untar implementation #435

Closed
wants to merge 50 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
9b25b4f
Add CNAB instructions to README
chris-crone Dec 5, 2018
291156a
Update code owners according to current project setup 😉
vdemeester Dec 6, 2018
6d3e443
Merge pull request #428 from vdemeester/update-owners
chris-crone Dec 7, 2018
24828bd
Fix Gopkg.lock
vdemeester Dec 11, 2018
2bb98bc
github.com/Microsoft/go-winio: v0.4.9 -> v0.4.11
vdemeester Dec 11, 2018
0788354
github.com/containerd/containerd: v1.1.2 -> v1.2.1
vdemeester Dec 11, 2018
52db6e8
github.com/coreos/etcd: v3.3.8 -> v3.3.10
vdemeester Dec 11, 2018
c1785df
github.com/davecgh/go-spew: v1.1.0 -> v1.1.1
vdemeester Dec 11, 2018
284f190
github.com/docker/go-connections: v0.3.0 -> v0.4.0
vdemeester Dec 11, 2018
794ea26
github.com/gogo/protobuf: v1.1.1 -> v1.2.0
vdemeester Dec 11, 2018
73dc59c
github.com/golang/protobuf: v1.1.0 -> v1.2.0
vdemeester Dec 11, 2018
01722a2
github.com/json-iterator/go: 1.1.4 -> v1.1.5
vdemeester Dec 11, 2018
173b18d
github.com/sirupsen/logrus: v1.0.6 -> v1.2.0
vdemeester Dec 11, 2018
3eb74b9
github.com/vbatts/tar-split: v0.10.2 -> v0.11.1
vdemeester Dec 11, 2018
e4da4c9
gotest.tools: v2.1.0 -> v2.2.0
vdemeester Dec 11, 2018
20ebb61
Merge pull request #431 from vdemeester/dep-dep-dep
silvin-lubecki Dec 28, 2018
b6d3d89
Removing Helm command until we find a way to re-introduce it with CNAB.
silvin-lubecki Jan 7, 2019
9561bf4
Remove fork command as with CNAB the application package is not pushe…
silvin-lubecki Jan 7, 2019
bf8ecad
Merge pull request #437 from silvin-lubecki/remove-commands
simonferquel Jan 7, 2019
012141a
Rename settings to parameters, to fit with CNAB vocabulary
chris-crone Nov 23, 2018
c0c9cd6
Return error if app bundle contains settings.yml but not parameters.yml
chris-crone Nov 23, 2018
87bb12f
Merge pull request #438 from silvin-lubecki/settings-to-parameters
chris-crone Jan 8, 2019
9851d50
Use a valid user name (lowercase) in examples
silvin-lubecki Jan 8, 2019
0a881da
Remove '_' in volume's name as it is invalid with kubernetes.
silvin-lubecki Jan 8, 2019
92197ca
Merge pull request #441 from silvin-lubecki/clean-examples
chris-crone Jan 8, 2019
0796c0e
Clean the fork command specific types
silvin-lubecki Jan 8, 2019
3603491
Merge pull request #442 from silvin-lubecki/clean-fork
chris-crone Jan 8, 2019
aba83a5
Introduce a new run binary, which is the new docker-app CNAB "backend".
silvin-lubecki Jan 15, 2019
5e2847c
fix port '80' is already in use
tullo Jan 23, 2019
7bb197d
Correct build instruction for experimental build
tullo Jan 24, 2019
7ba453c
Merge pull request #447 from tullo/building
vdemeester Jan 24, 2019
a205ea2
Add missing 'TraverseChildren: true' in the cobra.Command
tullo Jan 24, 2019
cdcf401
Merge pull request #449 from tullo/root-flags
simonferquel Jan 24, 2019
78fa752
Merge pull request #446 from tullo/patch-port-issue
silvin-lubecki Jan 25, 2019
f5a6965
Improving installer scripts
joeabbey Jan 27, 2019
e69b627
Merge pull request #450 from joeabbey/install-one-liners
chris-crone Jan 30, 2019
f009c0e
Add the CNAB base invocation-image build target in the Dockerfile.
silvin-lubecki Jan 15, 2019
5bf177d
Add bundle command to create a CNAB from a Docker Application Package
silvin-lubecki Jan 15, 2019
8574b9a
Bump docker/cli, moby/moby, grpc, runc and duffle
silvin-lubecki Jan 16, 2019
daa2241
* Add Install command to install any CNAB bundle.
silvin-lubecki Jan 16, 2019
76b4d3c
Add Uninstall command, to uninstall a claim from the duffle claim store.
silvin-lubecki Jan 16, 2019
bd3b894
Add upgrade command to modify a CNAB installation.
silvin-lubecki Jan 16, 2019
5633f15
Add status command to query the status of a CNAB installation.
silvin-lubecki Jan 16, 2019
d17548a
Update README with CNAB
silvin-lubecki Jan 16, 2019
520a7b1
Add CNAB examples
chris-crone Dec 5, 2018
172ce06
getTargetContext now resolves the current context if the target conte…
silvin-lubecki Jan 17, 2019
312da0c
Rename the cmd/run binary to cmd/cnab-run.
silvin-lubecki Jan 17, 2019
d8fe337
Various cleanings, including missing EOL, typos, comments, ...
silvin-lubecki Jan 21, 2019
196387f
Wrap tar errors with some context
silvin-lubecki Jan 28, 2019
6c84a2b
Merge pull request #443 from silvin-lubecki/add-cnab-core-commands
simonferquel Jan 31, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 4 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
* text=auto
*.sh text eol=lf
*.go text eol=lf
* text eol=lf
*.png binary
*.exe binary
*.ico binary
*.jar binary
vendor/** -text
10 changes: 5 additions & 5 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# GitHub code owners
# See https://github.com/blog/2392-introducing-code-owners

cmd/docker-app/*** @mnottale @vdemeester
e2e/*** @mnottale @vdemeester
Jenkinsfile @vdemeester
Dockerfile* @vdemeester
*Makefile @vdemeester
cmd/docker-app/*** @silvin-lubecki
e2e/*** @silvin-lubecki
Jenkinsfile @silvin-lubecki @chris-crone
Dockerfile* @silvin-lubecki @chris-crone
*Makefile @silvin-lubecki @chris-crone
docs @chris-crone
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@
*.dockerapp
_build/
bin/
!examples/simple/*.dockerapp
!examples/*/*.dockerapp
!e2e/**/*.dockerapp
!integrations/**/*.dockerapp
.gradle
coverage.html
cover.out
2 changes: 1 addition & 1 deletion BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Please refer to its documentation if you need to update a dependency.

Just add the `EXPERIMENTAL=on` flag before invoking a build target:
```console
$ make EXPERIMEMTAL=on bin/docker-app
$ make EXPERIMENTAL=on bin/docker-app
$ ./bin/docker-app version
...
Experimental: on
Expand Down
15 changes: 15 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ RUN curl -Ls https://download.docker.com/linux/static/$DOCKERCLI_CHANNEL/x86_64/

WORKDIR /go/src/github.com/docker/app/

# main dev image
FROM build AS dev
ENV PATH=${PATH}:/go/src/github.com/docker/app/bin/
ARG DEP_VERSION=v0.5.0
Expand All @@ -36,4 +37,18 @@ RUN make EXPERIMENTAL=${EXPERIMENTAL} cross
# FIXME(vdemeester) change from docker-app to dev once buildkit is merged in moby/docker
FROM cross AS e2e-cross
ARG EXPERIMENTAL="off"
# Run e2e tests
RUN make EXPERIMENTAL=${EXPERIMENTAL} e2e-cross

# builder of invocation image entrypoint
FROM build AS invocation-build
COPY . .
ARG EXPERIMENTAL="off"
RUN make EXPERIMENTAL=${EXPERIMENTAL} bin/cnab-run

# cnab invocation image
FROM alpine:${ALPINE_VERSION} AS invocation
RUN apk add --no-cache ca-certificates
COPY --from=invocation-build /go/src/github.com/docker/app/bin/cnab-run /cnab/app/run
WORKDIR /cnab/app
CMD /cnab/app/run
Loading