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

dockerfile: update run mounts to stable channel #1717

Merged
merged 1 commit into from
Oct 5, 2020
Merged

dockerfile: update run mounts to stable channel #1717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ run:
modules-download-mode: vendor

build-tags:
- dfrunmount
- dfssh
- dfrunsecurity
- dfrunnetwork

linters:
enable:
Expand All @@ -29,4 +29,4 @@ issues:
exclude-rules:
- linters:
- golint
text: "stutters"
text: "stutters"
2 changes: 1 addition & 1 deletion frontend/dockerfile/cmd/dockerfile-frontend/hack/release
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ case $TYP in
;;
"daily")
if [ -z $DAILY_TARGETS ]; then
DAILY_TARGETS="mounts secrets ssh"
# DAILY_TARGETS=""
fi

for TAG in $DAILY_TARGETS; do
Expand Down
16 changes: 0 additions & 16 deletions frontend/dockerfile/dockerfile2llb/convert_norunmount.go
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions frontend/dockerfile/dockerfile2llb/convert_nosecrets.go
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions frontend/dockerfile/dockerfile2llb/convert_nossh.go
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions frontend/dockerfile/dockerfile2llb/convert_runmount.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build dfrunmount

package dockerfile2llb

import (
Expand Down
2 changes: 0 additions & 2 deletions frontend/dockerfile/dockerfile2llb/convert_secrets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build dfsecrets

package dockerfile2llb

import (
Expand Down
2 changes: 0 additions & 2 deletions frontend/dockerfile/dockerfile2llb/convert_ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build dfssh

package dockerfile2llb

import (
Expand Down
2 changes: 0 additions & 2 deletions frontend/dockerfile/dockerfile_mount_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build dfrunmount

package dockerfile

import (
Expand Down
2 changes: 0 additions & 2 deletions frontend/dockerfile/dockerfile_secrets_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build dfsecrets

package dockerfile

import (
Expand Down
2 changes: 0 additions & 2 deletions frontend/dockerfile/dockerfile_ssh_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build dfssh

package dockerfile

import (
Expand Down
7 changes: 0 additions & 7 deletions frontend/dockerfile/instructions/commands_nosecrets.go
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions frontend/dockerfile/instructions/commands_nossh.go
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions frontend/dockerfile/instructions/commands_runmount.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build dfrunmount

package instructions

import (
Expand Down
2 changes: 0 additions & 2 deletions frontend/dockerfile/instructions/commands_secrets.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build dfsecrets

package instructions

func isSecretMountsSupported() bool {
Expand Down
2 changes: 0 additions & 2 deletions frontend/dockerfile/instructions/commands_ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
// +build dfssh

package instructions

func isSSHMountsSupported() bool {
Expand Down
2 changes: 1 addition & 1 deletion frontend/dockerfile/release/experimental/tags
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
dfrunmount dfrunsecurity dfsecrets dfssh dfrunnetwork
dfrunsecurity dfrunnetwork
1 change: 0 additions & 1 deletion frontend/dockerfile/release/mounts/tags
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion frontend/dockerfile/release/secrets/tags
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion frontend/dockerfile/release/ssh/tags
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion hack/test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ fi
DOCKERFILE_RELEASES_CUSTOM=""
if [ "$TEST_DOCKERFILE" == 1 ]; then
if [ -z $DOCKERFILE_RELEASES ]; then
DOCKERFILE_RELEASES="mainline experimental mounts secrets ssh"
Copy link
Member

Choose a reason for hiding this comment

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

should we add mounts , secrets, and ssh as aliases for the stable image, so that dockerfiles that refer that syntax will get the current stable, and not some outdated version?

Copy link
Member

Choose a reason for hiding this comment

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

Or perhaps also ignore the syntax for current versions as it would now be the default, so don't (try to ) pull the frontend?

Copy link
Collaborator

Choose a reason for hiding this comment

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

As long as DockerHub doesn't GC the latest mounts, secrets, and ssh images, I think it's fine? I think if secrets suddenly is supported on the mounts image that would be more confusing as an user.

Copy link
Member Author

Choose a reason for hiding this comment

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

There is no mounts, secrets channel in dockerhub. Only daily builds that in dockerfile-upstream are timestamped already.

DOCKERFILE_RELEASES="mainline experimental"
else
DOCKERFILE_RELEASES_CUSTOM=1
fi
Expand Down