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.

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

Fully qualify images in dockerfile tests #257

Merged
merged 1 commit into from
Jul 26, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion integration/dockerfiles/Dockerfile_onbuild_base
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/google-appengine/debian9:latest
FROM gcr.io/google-appengine/debian9@sha256:1d6a9a6d106bd795098f60f4abb7083626354fa6735e81743c7f8cfca11259f0
ENV dir /tmp/dir/
ONBUILD RUN echo "onbuild" > /tmp/onbuild
ONBUILD RUN mkdir $dir
Expand Down
2 changes: 1 addition & 1 deletion integration/dockerfiles/Dockerfile_test_add
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/google-appengine/debian9:latest
FROM gcr.io/google-appengine/debian9@sha256:1d6a9a6d106bd795098f60f4abb7083626354fa6735e81743c7f8cfca11259f0
# First, try adding some regular files
ADD context/foo foo
ADD context/foo /foodir/
Expand Down
2 changes: 1 addition & 1 deletion integration/dockerfiles/Dockerfile_test_copy
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine@sha256:5ce5f501c457015c4b91f91a15ac69157d9b06f1a75cf9107bf2b62e0843983a
COPY context/foo foo
COPY context/foo /foodir/
COPY context/bar/b* bar/
Expand Down
2 changes: 1 addition & 1 deletion integration/dockerfiles/Dockerfile_test_copy_bucket
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine@sha256:5ce5f501c457015c4b91f91a15ac69157d9b06f1a75cf9107bf2b62e0843983a
COPY context/foo foo
COPY context/foo /foodir/
COPY context/bar/b* bar/
Expand Down
2 changes: 1 addition & 1 deletion integration/dockerfiles/Dockerfile_test_copy_reproducible
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM alpine:3.7
FROM alpine@sha256:5ce5f501c457015c4b91f91a15ac69157d9b06f1a75cf9107bf2b62e0843983a
COPY context/foo foo
COPY context/foo /foodir/
COPY context/bar/b* bar/
Expand Down
2 changes: 1 addition & 1 deletion integration/dockerfiles/Dockerfile_test_env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/google-appengine/debian9
FROM gcr.io/google-appengine/debian9@sha256:1d6a9a6d106bd795098f60f4abb7083626354fa6735e81743c7f8cfca11259f0
ENV hey hey
ENV PATH /usr/local
ENV hey hello
Expand Down
2 changes: 1 addition & 1 deletion integration/dockerfiles/Dockerfile_test_expose
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/google-appengine/debian9
FROM gcr.io/google-appengine/debian9@sha256:1d6a9a6d106bd795098f60f4abb7083626354fa6735e81743c7f8cfca11259f0
EXPOSE 80
EXPOSE 81/udp
ENV protocol tcp
Expand Down
2 changes: 1 addition & 1 deletion integration/dockerfiles/Dockerfile_test_extract_fs
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM gcr.io/google-appengine/debian9:latest
FROM gcr.io/google-appengine/debian9@sha256:1d6a9a6d106bd795098f60f4abb7083626354fa6735e81743c7f8cfca11259f0
2 changes: 1 addition & 1 deletion integration/dockerfiles/Dockerfile_test_label
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/google-appengine/debian9
FROM gcr.io/google-appengine/debian9@sha256:1d6a9a6d106bd795098f60f4abb7083626354fa6735e81743c7f8cfca11259f0
LABEL foo=bar
LABEL "baz"="bat"
ENV label1 "mylabel"
Expand Down
2 changes: 1 addition & 1 deletion integration/dockerfiles/Dockerfile_test_metadata
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/distroless/base:latest
FROM gcr.io/distroless/base@sha256:628939ac8bf3f49571d05c6c76b8688cb4a851af6c7088e599388259875bde20
CMD ["command", "one"]
CMD ["command", "two"]
CMD echo "hello"
Expand Down
2 changes: 1 addition & 1 deletion integration/dockerfiles/Dockerfile_test_multistage
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/distroless/base:latest as base
FROM gcr.io/distroless/base@sha256:628939ac8bf3f49571d05c6c76b8688cb4a851af6c7088e599388259875bde20 as base
COPY . .

FROM scratch as second
Expand Down
2 changes: 1 addition & 1 deletion integration/dockerfiles/Dockerfile_test_mv_add
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM busybox
FROM busybox@sha256:1bd6df27274fef1dd36eb529d0f4c8033f61c675d6b04213dd913f902f7cafb5
ADD context/tars /tmp/tars
RUN mv /tmp/tars /foo
2 changes: 1 addition & 1 deletion integration/dockerfiles/Dockerfile_test_registry
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
FROM busybox
FROM busybox@sha256:1bd6df27274fef1dd36eb529d0f4c8033f61c675d6b04213dd913f902f7cafb5
RUN echo "hey" > /hey
2 changes: 1 addition & 1 deletion integration/dockerfiles/Dockerfile_test_run
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM gcr.io/google-appengine/debian9
FROM gcr.io/google-appengine/debian9@sha256:1d6a9a6d106bd795098f60f4abb7083626354fa6735e81743c7f8cfca11259f0
RUN echo "hey" > /etc/foo
RUN echo "baz" > /etc/baz
RUN cp /etc/baz /etc/bar
Expand Down
2 changes: 1 addition & 1 deletion integration/dockerfiles/Dockerfile_test_run_2
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
# Test to make sure the executor builds an image correctly
# when no files are changed

FROM gcr.io/google-appengine/debian9
FROM gcr.io/google-appengine/debian9@sha256:1d6a9a6d106bd795098f60f4abb7083626354fa6735e81743c7f8cfca11259f0
RUN echo "hey"
MAINTAINER kaniko
2 changes: 1 addition & 1 deletion integration/dockerfiles/Dockerfile_test_user_run
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM gcr.io/google-appengine/debian9
FROM gcr.io/google-appengine/debian9@sha256:1d6a9a6d106bd795098f60f4abb7083626354fa6735e81743c7f8cfca11259f0
RUN useradd testuser
RUN groupadd testgroup
USER testuser:testgroup
Expand Down
2 changes: 1 addition & 1 deletion integration/dockerfiles/Dockerfile_test_volume
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM gcr.io/google-appengine/debian9
FROM gcr.io/google-appengine/debian9@sha256:1d6a9a6d106bd795098f60f4abb7083626354fa6735e81743c7f8cfca11259f0
RUN mkdir /foo
RUN echo "hello" > /foo/hey
VOLUME /foo/bar /tmp
Expand Down