Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add dockerignore as part of remote deploy #3339

Merged
merged 4 commits into from
Jan 17, 2023
Merged

add dockerignore as part of remote deploy #3339

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1a918a7
add dockerignore as part of remote deploy
AdrianPedriza Jan 17, 2023
d0b8541
fix test
AdrianPedriza Jan 17, 2023
0e7328c
fix: unit tests
jLopezbarb Jan 17, 2023
b0fe078
refactor test
AdrianPedriza Jan 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
48 changes: 37 additions & 11 deletions cmd/deploy/remote.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ package deploy

import (
"context"
"errors"
"fmt"
"math/rand"
"os"
Expand Down Expand Up @@ -80,11 +81,13 @@ type dockerfileTemplateProperties struct {

type remoteDeployCommand struct {
builder *buildv2.OktetoBuilder
fs afero.Fs
}

func newRemoteDeployer(builder *buildv2.OktetoBuilder) *remoteDeployCommand {
return &remoteDeployCommand{
builder: builder,
fs: afero.NewOsFs(),
Copy link
Contributor

Choose a reason for hiding this comment

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

Nice 🚀

Copy link
Contributor Author

Choose a reason for hiding this comment

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

💉

}
}

Expand All @@ -95,12 +98,7 @@ func (rd *remoteDeployCommand) deploy(ctx context.Context, deployOptions *Option
return err
}

c, _, err := okteto.NewK8sClientProvider().Provide(okteto.Context().Cfg)
if err != nil {
return err
}

setDeployOptionsValuesFromManifest(ctx, deployOptions, cwd, c)
cwd = getOriginalCWD(cwd, deployOptions.ManifestPathFlag)

tmpl, err := template.New("dockerfile").Parse(dockerfileTemplate)
if err != nil {
Expand All @@ -122,15 +120,23 @@ func (rd *remoteDeployCommand) deploy(ctx context.Context, deployOptions *Option
DeployFlags: strings.Join(getDeployFlags(deployOptions), " "),
}

fs := afero.NewOsFs()
tmpDir, err := afero.TempDir(rd.fs, "", "")
if err != nil {
return err
}

dockerfile, err := rd.fs.Create(fmt.Sprintf("%s/deploy", tmpDir))
if err != nil {
return err
}

dockerfile, err := afero.TempFile(fs, "", "Dockerfile.okteto.deploy")
err = rd.createDockerignoreIfNeeded(cwd, tmpDir)
if err != nil {
return err
}

defer func() {
if err := fs.Remove(dockerfile.Name()); err != nil {
if err := rd.fs.Remove(dockerfile.Name()); err != nil {
oktetoLog.Infof("error removing dockerfile: %w", err)
}
}()
Expand All @@ -142,8 +148,6 @@ func (rd *remoteDeployCommand) deploy(ctx context.Context, deployOptions *Option
Dockerfile: dockerfile.Name(),
}

cwd = getOriginalCWD(cwd, deployOptions.ManifestPathFlag)

// undo modification of CWD for Build command
os.Chdir(cwd)

Expand All @@ -167,6 +171,28 @@ func (rd *remoteDeployCommand) cleanUp(ctx context.Context, err error) {
return
}

func (rd *remoteDeployCommand) createDockerignoreIfNeeded(cwd, tmpDir string) error {
dockerignoreName := "deploy.dockerignore"
dockerignoreFilePath := fmt.Sprintf("%s/%s", cwd, dockerignoreName)
if _, err := rd.fs.Stat(dockerignoreFilePath); err != nil {
if !errors.Is(err, os.ErrNotExist) {
return err
}
} else {
dockerignoreContent, err := afero.ReadFile(rd.fs, dockerignoreFilePath)
if err != nil {
return err
}

err = afero.WriteFile(rd.fs, fmt.Sprintf("%s/%s", tmpDir, dockerignoreName), dockerignoreContent, 0600)
if err != nil {
return err
}
}

return nil
}

func getDeployFlags(opts *Options) []string {
var deployFlags []string

Expand Down