Implement docker.#Dockerfile #1525

TomChv · 2022-01-28T13:57:14Z

Changes

Related to #1407.

Implement docker.#Dockerfile definition which is basically a mirror on engine.#Dockerfile

⚠️ This PR will have conflict with #1524, a rebase will be necessary since I wanted to split those two improvement.

Tests

Build an image with an aligned dockerfile
Build an image with an input

netlify · 2022-01-28T14:36:14Z

✔️ Deploy Preview for devel-docs-dagger-io ready!

🔨 Explore the source changes: c6da3ee

🔍 Inspect the deploy log: https://app.netlify.com/sites/devel-docs-dagger-io/deploys/62346f5afa5d3a00088530bf

😎 Browse the preview: https://deploy-preview-1525--devel-docs-dagger-io.netlify.app

aluzzardi · 2022-01-28T19:48:00Z

pkg/universe.dagger.io/docker/build.cue

this inconsistency will go away with #1452

pkg/universe.dagger.io/docker/build.cue

aluzzardi · 2022-01-28T19:50:32Z

pkg/universe.dagger.io/docker/build.cue

Drift: This is called input in docker.#Dockerfile and source in engine.#Dockerfile

@shykes should we converge the two?

Also, I don't think this should be optional?

So how should we handle the case where someone start a docker.#Build with a docker.#Dockerfile?

Good point, I don't know.

If we want to support that, IMHO it should be in engine.#Dockerfile rather than here. This should be a 1:1 wrapper as much as possible, instead of having a different behavior.

Deferring to @shykes for DX design

The correct field name is source.

You can't pass an input image to engine.#Dockerfile, because Dockerfiles specify their own base images with FROM

In that way, engine.#Dockerfile is similar to engine.#GitPull, engine.#DockerPull, engine.#HTTPFetch: when used in a pipeline, it will always be the first step.

For the same reason, docker.#Dockerfile doesn't have an input field either, and when used in a docker.#Build pipeline, should always be the first step.

docker.#Buildsupports this by making input optional in build steps: only output is mandtory.
Hope this helps.

aluzzardi · 2022-01-28T19:50:44Z

pkg/universe.dagger.io/docker/build.cue

Not sure this is needed if input is not optional

True, but it should actually (see my response above)

shykes · 2022-02-11T19:45:52Z

pkg/universe.dagger.io/docker/build.cue

The correct field name is source.

You can't pass an input image to engine.#Dockerfile, because Dockerfiles specify their own base images with FROM

In that way, engine.#Dockerfile is similar to engine.#GitPull, engine.#DockerPull, engine.#HTTPFetch: when used in a pipeline, it will always be the first step.

For the same reason, docker.#Dockerfile doesn't have an input field either, and when used in a docker.#Build pipeline, should always be the first step.

docker.#Buildsupports this by making input optional in build steps: only output is mandtory.
Hope this helps.

shykes · 2022-02-11T19:46:55Z

Sorry for the delay in review. It's been a busy couple weeks!

shykes · 2022-02-23T18:48:37Z

Picking this up. Do we still want this merged for the release?

github-actions · 2022-03-11T01:58:53Z

This PR is stale because it has been open 14 days with no activity. Remove stale label or comment or this will be closed in 7 days.

github-actions · 2022-03-18T02:01:24Z

This PR was closed because it has been stalled for 7 days with no activity.

gerhard · 2022-03-18T10:48:52Z

@aluzzardi I will assume that this something that we want to merge in for v0.2.2

@TomChv is going to clean it up and I am going to merge it if everything checks out.

I am doing a code review now, before the last changes land, so that it can get merged in the next hour.

Thank you @helderco for mentioning this PR in this morning's Europe sync 🙌🏻

Signed-off-by: Vasek - Tom C <[email protected]>

- Remove input field - Fix auth consistency - Cleanup test Signed-off-by: Vasek - Tom C <[email protected]>

pkg/universe.dagger.io/docker/build.cue

Signed-off-by: Vasek - Tom C <[email protected]>

gerhard

Everything checks for me, merging.

gerhard · 2022-03-18T13:42:37Z

@TomChv if this fixes an issue, please mark it so. Same if there is a task in an issue that this ✅

shykes · 2022-03-18T23:28:04Z

Before we merge this, how do you feel about moving this to a subpackage universe.dagger.io/docker/dockerfile with for example dockerfile.#Run?

gerhard · 2022-03-19T09:03:22Z

While these changes are already merged, I value your improvement principle @shykes.

I can see how splitting all definitions into their own individual files would help with discoverability.

I am unsure whether editor tags - in the vim tags sense - exist in the CUE ecosystem, but that is how I usually prefer to jump to definitions in a programming language. This is one of my favourite features of vim-go for example. The point being that with that approach, it really doesn't matter whether all definitions are in one file, or spread across multiple files.

I am on the fence with this one. Regardless what we decide to do, being consistent is most important, and everyone knowing which approach to use going forward would help greatly. What are your thoughts on this @aluzzardi?

shykes · 2022-03-19T15:01:49Z

As I said before. Please do not merge any changes to universe without my review... Please.

TomChv requested a review from aluzzardi January 28, 2022 13:57

TomChv self-assigned this Jan 28, 2022

TomChv added area/tests labels Jan 28, 2022

aluzzardi reviewed Jan 28, 2022

View reviewed changes

shykes requested changes Feb 11, 2022

View reviewed changes

TomChv requested review from aluzzardi and shykes and removed request for shykes February 17, 2022 16:49

github-actions bot added the kind/stale label Mar 11, 2022

github-actions bot closed this Mar 18, 2022

gerhard reopened this Mar 18, 2022

TomChv added 3 commits March 18, 2022 11:58

Update docker.#Dockerfile to be a 1:1 mirror to engine.#Dockerfile

5626787

Signed-off-by: Vasek - Tom C <[email protected]>

Add tests on docker.#Dockerfile

c90be84

Signed-off-by: Vasek - Tom C <[email protected]>

Apply Solomon comments

cc601a4

- Remove input field - Fix auth consistency - Cleanup test Signed-off-by: Vasek - Tom C <[email protected]>

gerhard reviewed Mar 18, 2022

View reviewed changes

pkg/universe.dagger.io/docker/build.cue Outdated Show resolved Hide resolved

Update dockerfile test to use client API

c6da3ee

Signed-off-by: Vasek - Tom C <[email protected]>

gerhard approved these changes Mar 18, 2022

View reviewed changes

gerhard merged commit 7492789 into dagger:main Mar 18, 2022

gerhard deleted the feat/docker-dockerfile branch March 18, 2022 13:41

helderco mentioned this pull request Mar 21, 2022

Fix docker.#Dockerfile test #1828

Merged

Implement docker.#Dockerfile #1525

Implement docker.#Dockerfile #1525

Uh oh!

Conversation

TomChv commented Jan 28, 2022 • edited by gerhard Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Changes

Tests

Uh oh!

netlify bot commented Jan 28, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

shykes commented Feb 11, 2022

Uh oh!

shykes commented Feb 23, 2022

Uh oh!

github-actions bot commented Mar 11, 2022

Uh oh!

github-actions bot commented Mar 18, 2022

Uh oh!

gerhard commented Mar 18, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

gerhard left a comment

Choose a reason for hiding this comment

Uh oh!

gerhard commented Mar 18, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

shykes commented Mar 18, 2022

Uh oh!

gerhard commented Mar 19, 2022

Uh oh!

shykes commented Mar 19, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

TomChv commented Jan 28, 2022 •

edited by gerhard

Loading

netlify bot commented Jan 28, 2022 •

edited

Loading

gerhard commented Mar 18, 2022 •

edited

Loading

gerhard commented Mar 18, 2022 •

edited

Loading