Skip to content

Commit 89d870a

Browse files
authored
Merge pull request #220 from mythi/lock
0.15.0-rc1
2 parents 01b11d9 + ad484d3 commit 89d870a

16 files changed

+24
-24
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ clean:
4343

4444
ORG?=intel
4545
REG?=$(ORG)/
46-
TAG?=devel
46+
TAG?=0.15.0-rc.1
4747
export TAG
4848

4949
images = $(shell ls build/docker/*.Dockerfile | sed 's/.*\/\(.\+\)\.Dockerfile/\1/')

build/docker/intel-fpga-admissionwebhook.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#
77
# This is used on release branches before tagging a stable version.
88
# The master branch defaults to using the latest Clear Linux.
9-
ARG CLEAR_LINUX_BASE=clearlinux/golang:latest
9+
ARG CLEAR_LINUX_BASE=clearlinux/golang@sha256:3b7841bb4fc15d6b6cfb3bdef12f385696efa9915541223848774a071c29be03
1010

1111
FROM ${CLEAR_LINUX_BASE} as builder
1212

13-
ARG CLEAR_LINUX_VERSION=
13+
ARG CLEAR_LINUX_VERSION="--version=30970"
1414

1515
RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION}
1616
RUN mkdir /install_root \

build/docker/intel-fpga-initcontainer.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#
77
# This is used on release branches before tagging a stable version.
88
# The master branch defaults to using the latest Clear Linux.
9-
ARG CLEAR_LINUX_BASE=clearlinux/golang:latest
9+
ARG CLEAR_LINUX_BASE=clearlinux/golang@sha256:3b7841bb4fc15d6b6cfb3bdef12f385696efa9915541223848774a071c29be03
1010

1111
FROM ${CLEAR_LINUX_BASE} as builder
1212

13-
ARG CLEAR_LINUX_VERSION=
13+
ARG CLEAR_LINUX_VERSION="--version=30970"
1414

1515
RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION}
1616
RUN mkdir /install_root \

build/docker/intel-fpga-plugin.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#
77
# This is used on release branches before tagging a stable version.
88
# The master branch defaults to using the latest Clear Linux.
9-
ARG CLEAR_LINUX_BASE=clearlinux/golang:latest
9+
ARG CLEAR_LINUX_BASE=clearlinux/golang@sha256:3b7841bb4fc15d6b6cfb3bdef12f385696efa9915541223848774a071c29be03
1010

1111
FROM ${CLEAR_LINUX_BASE} as builder
1212

13-
ARG CLEAR_LINUX_VERSION=
13+
ARG CLEAR_LINUX_VERSION="--version=30970"
1414

1515
RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION}
1616
RUN mkdir /install_root \

build/docker/intel-gpu-plugin.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#
77
# This is used on release branches before tagging a stable version.
88
# The master branch defaults to using the latest Clear Linux.
9-
ARG CLEAR_LINUX_BASE=clearlinux/golang:latest
9+
ARG CLEAR_LINUX_BASE=clearlinux/golang@sha256:3b7841bb4fc15d6b6cfb3bdef12f385696efa9915541223848774a071c29be03
1010

1111
FROM ${CLEAR_LINUX_BASE} as builder
1212

13-
ARG CLEAR_LINUX_VERSION=
13+
ARG CLEAR_LINUX_VERSION="--version=30970"
1414

1515
RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION}
1616
RUN mkdir /install_root \

build/docker/intel-qat-plugin.Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#
77
# This is used on release branches before tagging a stable version.
88
# The master branch defaults to using the latest Clear Linux.
9-
ARG CLEAR_LINUX_BASE=clearlinux/golang:latest
9+
ARG CLEAR_LINUX_BASE=clearlinux/golang@sha256:3b7841bb4fc15d6b6cfb3bdef12f385696efa9915541223848774a071c29be03
1010

1111
FROM ${CLEAR_LINUX_BASE} as builder
1212

13-
ARG CLEAR_LINUX_VERSION=
13+
ARG CLEAR_LINUX_VERSION="--version=30970"
1414
ARG TAGS_KERNELDRV=
1515

1616
RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION}

demo/crypto-perf/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#
77
# This is used on release branches before tagging a stable version.
88
# The master branch defaults to using the latest Clear Linux.
9-
ARG CLEAR_LINUX_BASE=clearlinux:latest
9+
ARG CLEAR_LINUX_BASE=clearlinux@sha256:87949a09741d86c018829786a988987fdf7674ca4b94de52b5247f5bf0aa52f3
1010

1111
FROM ${CLEAR_LINUX_BASE} as builder
1212

13-
ARG CLEAR_LINUX_VERSION=
13+
ARG CLEAR_LINUX_VERSION="--version=30970"
1414

1515
RUN mkdir /install_root && \
1616
swupd os-install \

demo/intelfpga-job.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ spec:
1313
restartPolicy: Never
1414
containers:
1515
- name: intelfpga-demo-job-1
16-
image: intel/opae-nlb-demo:devel
16+
image: intel/opae-nlb-demo:0.15.0-rc.1
1717
imagePullPolicy: IfNotPresent
1818
securityContext:
1919
capabilities:

demo/opae-nlb-demo/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@
66
#
77
# This is used on release branches before tagging a stable version.
88
# The master branch defaults to using the latest Clear Linux.
9-
ARG CLEAR_LINUX_BASE=clearlinux:latest
9+
ARG CLEAR_LINUX_BASE=clearlinux@sha256:87949a09741d86c018829786a988987fdf7674ca4b94de52b5247f5bf0aa52f3
1010

1111
FROM ${CLEAR_LINUX_BASE} as builder
1212

13-
ARG CLEAR_LINUX_VERSION=
13+
ARG CLEAR_LINUX_VERSION="--version=30970"
1414

1515
RUN swupd update --no-boot-update ${CLEAR_LINUX_VERSION} && \
1616
swupd bundle-add wget c-basic devpkg-json-c devpkg-util-linux devpkg-hwloc doxygen Sphinx patch

demo/test-fpga-region.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
containers:
77
- name: test-container
8-
image: intel/opae-nlb-demo:devel
8+
image: intel/opae-nlb-demo:0.15.0-rc.1
99
imagePullPolicy: IfNotPresent
1010
securityContext:
1111
capabilities:

0 commit comments

Comments
 (0)