Merge pull request #355 from thaJeztah/18.09_backport_remove_pkcs11
[18.09 backport] Remove the pkcs11 tag, was a holdover from cli Upstream-commit: cc243930f1600d0a1a5621afe4bd3abe9c299c11 Component: packaging
This commit is contained in:
@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git
|
||||
ARG GO_VERSION
|
||||
ENV GOPATH /go
|
||||
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
|
||||
ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
|
||||
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
|
||||
ENV RUNC_BUILDTAGS apparmor seccomp selinux
|
||||
|
||||
ARG COMMON_FILES
|
||||
|
||||
@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git
|
||||
ARG GO_VERSION
|
||||
ENV GOPATH /go
|
||||
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
|
||||
ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
|
||||
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
|
||||
ENV RUNC_BUILDTAGS apparmor seccomp selinux
|
||||
|
||||
ARG COMMON_FILES
|
||||
|
||||
@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git
|
||||
ARG GO_VERSION
|
||||
ENV GOPATH /go
|
||||
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
|
||||
ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
|
||||
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
|
||||
ENV RUNC_BUILDTAGS apparmor seccomp selinux
|
||||
|
||||
ARG COMMON_FILES
|
||||
|
||||
@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git
|
||||
ARG GO_VERSION
|
||||
ENV GOPATH /go
|
||||
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
|
||||
ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
|
||||
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
|
||||
ENV RUNC_BUILDTAGS apparmor seccomp selinux
|
||||
|
||||
ARG COMMON_FILES
|
||||
|
||||
@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git
|
||||
ARG GO_VERSION
|
||||
ENV GOPATH /go
|
||||
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
|
||||
ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
|
||||
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
|
||||
ENV RUNC_BUILDTAGS apparmor seccomp selinux
|
||||
|
||||
ARG COMMON_FILES
|
||||
|
||||
@ -11,7 +11,7 @@ RUN apt-get update && apt-get install -y curl devscripts equivs git
|
||||
ARG GO_VERSION
|
||||
ENV GOPATH /go
|
||||
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
|
||||
ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
|
||||
ENV DOCKER_BUILDTAGS apparmor seccomp selinux
|
||||
ENV RUNC_BUILDTAGS apparmor seccomp selinux
|
||||
|
||||
ARG COMMON_FILES
|
||||
|
||||
@ -10,7 +10,7 @@ ENV SUITE 7
|
||||
ENV GOPATH=/go
|
||||
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
|
||||
ENV AUTO_GOPATH 1
|
||||
ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux
|
||||
ENV DOCKER_BUILDTAGS seccomp selinux
|
||||
ENV RUNC_BUILDTAGS seccomp selinux
|
||||
RUN yum install -y rpm-build rpmlint
|
||||
COPY SPECS /root/rpmbuild/SPECS
|
||||
|
||||
@ -10,7 +10,7 @@ ENV SUITE 27
|
||||
ENV GOPATH /go
|
||||
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
|
||||
ENV AUTO_GOPATH 1
|
||||
ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux
|
||||
ENV DOCKER_BUILDTAGS seccomp selinux
|
||||
ENV RUNC_BUILDTAGS seccomp selinux
|
||||
RUN dnf install -y rpm-build rpmlint dnf-plugins-core
|
||||
COPY SPECS /root/rpmbuild/SPECS
|
||||
|
||||
@ -10,7 +10,7 @@ ENV SUITE 28
|
||||
ENV GOPATH /go
|
||||
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
|
||||
ENV AUTO_GOPATH 1
|
||||
ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux
|
||||
ENV DOCKER_BUILDTAGS seccomp selinux
|
||||
ENV RUNC_BUILDTAGS seccomp selinux
|
||||
RUN dnf install -y rpm-build rpmlint dnf-plugins-core
|
||||
COPY SPECS /root/rpmbuild/SPECS
|
||||
|
||||
@ -10,7 +10,7 @@ ENV SUITE 29
|
||||
ENV GOPATH /go
|
||||
ENV PATH $PATH:/usr/local/go/bin:$GOPATH/bin
|
||||
ENV AUTO_GOPATH 1
|
||||
ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux
|
||||
ENV DOCKER_BUILDTAGS seccomp selinux
|
||||
ENV RUNC_BUILDTAGS seccomp selinux
|
||||
RUN dnf install -y rpm-build rpmlint dnf-plugins-core
|
||||
COPY SPECS /root/rpmbuild/SPECS
|
||||
|
||||
Reference in New Issue
Block a user