Move docker files to superset sub dir #59
Conversation
| @@ -1,17 +0,0 @@ | |||
| # | |||
There was a problem hiding this comment.
why do you need to delete it?
There was a problem hiding this comment.
We don't rely on the contents of .env for a normal installation of sandbox-ce, so I wanted to notify this somehow here. If you add variables here, they will not have an effect on our final distribution.
cmd/sandbox-ce/compose/compose.go
Outdated
| @@ -135,5 +135,6 @@ func Run(ctx context.Context, arg ...string) error { | |||
| return err | |||
| } | |||
|
|
|||
| return comp.Run(ctx, arg...) | |||
| newArgs := append([]string{"--project-name", "srcd"}, arg...) | |||
There was a problem hiding this comment.
github doesn't show conflict but current master already set project name
There was a problem hiding this comment.
in master it was a different method, so there was no conflict but the result would be the same arg added twice. I have removed it here, rebased on top of master and squashed.
| @@ -1,58 +0,0 @@ | |||
| # Licensed to the Apache Software Foundation (ASF) under one | |||
There was a problem hiding this comment.
maybe we should move our config here too?
There was a problem hiding this comment.
I was going to say no because right now superset_config and superset_config_dev are in the same dir. But moving it here allows us to detect if there's anything added in upstream, so makes sense. Done in df208b5.
Signed-off-by: Carlos Martín <[email protected]>
Fix #54.
The build now uses the
superset/contrib/dockerdir for the docker files, this way we can keep up with changes in upstream (there were a few small changes already that were missing from our Dockerfile).After moving the docker related files I've realized that the
.envfile was setting the docker compose project name, but this is not very reliable. If you download the binary from our releases page you will not have this file. So I added the--project-nameoption to thedocker-composecommand. I also tested this for the compose inside a container.