Skip to content

Commit

Permalink
Test build for #508
Browse files Browse the repository at this point in the history
  • Loading branch information
@dirkmueller
dirkmueller authored and SUSE Update Bot committed Jul 11, 2023
1 parent 8644198 commit a1f0acf
Show file tree
Hide file tree
Showing 14 changed files with 17 additions and 14 deletions.
3 changes: 2 additions & 1 deletion busybox-image/busybox-image.kiwi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@
<source path="obsrepositories:/"/>
</repository>
<packages type="bootstrap">
<package name="openSUSE-release"/>
<package name="openSUSE-release-appliance-docker"/>
<package name="busybox"/>
<package name="busybox-links"/>
<package name="distribution-release"/>
<package name="ca-certificates-mozilla-prebuilt"/>
</packages>

Expand Down
2 changes: 1 addition & 1 deletion golang-oldstable-image/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ LABEL org.opensuse.release-stage="released"

# endlabelprefix

RUN set -euo pipefail; zypper -n in --no-recommends go1.19 distribution-release make git-core; zypper -n clean; rm -rf /var/log/*
RUN set -euo pipefail; zypper -n in --no-recommends go1.19 make git-core; zypper -n clean; rm -rf /var/log/*
ENV GOLANG_VERSION="%%golang_version%%"
ENV GOPATH="/go"
ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
Expand Down
2 changes: 1 addition & 1 deletion golang-stable-image/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ LABEL org.opensuse.release-stage="released"

# endlabelprefix

RUN set -euo pipefail; zypper -n in --no-recommends go1.20 distribution-release make git-core; zypper -n clean; rm -rf /var/log/*
RUN set -euo pipefail; zypper -n in --no-recommends go1.20 make git-core; zypper -n clean; rm -rf /var/log/*
ENV GOLANG_VERSION="%%golang_version%%"
ENV GOPATH="/go"
ENV PATH="/go/bin:/usr/local/go/bin:/root/go/bin/:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
Expand Down
3 changes: 2 additions & 1 deletion micro-image/micro-image.kiwi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
<package name="bash"/>
<package name="ca-certificates-mozilla-prebuilt"/>
<package name="coreutils"/>
<package name="distribution-release"/>
<package name="openSUSE-release"/>
<package name="openSUSE-release-appliance-docker"/>
</packages>

</image>
3 changes: 2 additions & 1 deletion minimal-image/minimal-image.kiwi
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@
<package name="libzio1"/>
</packages>
<packages type="bootstrap">
<package name="distribution-release"/>
<package name="openSUSE-release"/>
<package name="openSUSE-release-appliance-docker"/>
<package name="rpm"/>
</packages>

Expand Down
2 changes: 1 addition & 1 deletion nodejs-20-image/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ LABEL org.opensuse.release-stage="released"

# endlabelprefix

RUN set -euo pipefail; zypper -n in --no-recommends nodejs20 npm20 git-core update-alternatives distribution-release; zypper -n clean; rm -rf /var/log/*
RUN set -euo pipefail; zypper -n in --no-recommends nodejs20 npm20 git-core update-alternatives; zypper -n clean; rm -rf /var/log/*
ENV NODE_VERSION="20"

2 changes: 1 addition & 1 deletion postgres-12-image/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ LABEL org.opensuse.release-stage="released"

# endlabelprefix

RUN set -euo pipefail; zypper -n in --no-recommends postgresql12-server distribution-release; zypper -n clean; rm -rf /var/log/*
RUN set -euo pipefail; zypper -n in --no-recommends postgresql12-server; zypper -n clean; rm -rf /var/log/*
ENV LANG="en_US.utf8"
ENV PG_MAJOR="12"
ENV PG_VERSION="%%pg_version%%"
Expand Down
2 changes: 1 addition & 1 deletion postgres-13-image/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ LABEL org.opensuse.release-stage="released"

# endlabelprefix

RUN set -euo pipefail; zypper -n in --no-recommends postgresql13-server distribution-release; zypper -n clean; rm -rf /var/log/*
RUN set -euo pipefail; zypper -n in --no-recommends postgresql13-server; zypper -n clean; rm -rf /var/log/*
ENV LANG="en_US.utf8"
ENV PG_MAJOR="13"
ENV PG_VERSION="%%pg_version%%"
Expand Down
2 changes: 1 addition & 1 deletion postgres-14-image/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ LABEL org.opensuse.release-stage="released"

# endlabelprefix

RUN set -euo pipefail; zypper -n in --no-recommends postgresql14-server distribution-release; zypper -n clean; rm -rf /var/log/*
RUN set -euo pipefail; zypper -n in --no-recommends postgresql14-server; zypper -n clean; rm -rf /var/log/*
ENV LANG="en_US.utf8"
ENV PG_MAJOR="14"
ENV PG_VERSION="%%pg_version%%"
Expand Down
2 changes: 1 addition & 1 deletion postgres-15-image/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ LABEL org.opensuse.release-stage="released"

# endlabelprefix

RUN set -euo pipefail; zypper -n in --no-recommends postgresql15-server distribution-release; zypper -n clean; rm -rf /var/log/*
RUN set -euo pipefail; zypper -n in --no-recommends postgresql15-server; zypper -n clean; rm -rf /var/log/*
ENV LANG="en_US.utf8"
ENV PG_MAJOR="15"
ENV PG_VERSION="%%pg_version%%"
Expand Down
2 changes: 1 addition & 1 deletion rmt-nginx-image/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ LABEL org.opensuse.release-stage="released"

# endlabelprefix

RUN set -euo pipefail; zypper -n in --no-recommends nginx distribution-release; zypper -n clean; rm -rf /var/log/*
RUN set -euo pipefail; zypper -n in --no-recommends nginx; zypper -n clean; rm -rf /var/log/*
ENTRYPOINT ["/docker-entrypoint.sh"]
CMD ["nginx", "-g", "daemon off;"]
EXPOSE 80
Expand Down
2 changes: 1 addition & 1 deletion ruby-3.2-image/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ LABEL org.opensuse.release-stage="released"

# endlabelprefix

RUN set -euo pipefail; zypper -n in --no-recommends ruby3.2 ruby3.2-rubygem-bundler ruby3.2-devel util-linux curl git-core distribution-release gcc-c++ sqlite3-devel make awk timezone; zypper -n clean; rm -rf /var/log/*
RUN set -euo pipefail; zypper -n in --no-recommends ruby3.2 ruby3.2-rubygem-bundler ruby3.2-devel util-linux curl git-core gcc-c++ sqlite3-devel make awk timezone; zypper -n clean; rm -rf /var/log/*
ENV LANG="C.UTF-8"
ENV RUBY_VERSION="%%rb_ver%%"
ENV RUBY_MAJOR="%%rb_maj%%"
Expand Down
2 changes: 1 addition & 1 deletion rust-oldstable-image/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ LABEL org.opensuse.release-stage="released"

# endlabelprefix

RUN set -euo pipefail; zypper -n in --no-recommends rust1.69 cargo1.69 distribution-release; zypper -n clean; rm -rf /var/log/*
RUN set -euo pipefail; zypper -n in --no-recommends rust1.69 cargo1.69; zypper -n clean; rm -rf /var/log/*
ENV RUST_VERSION="%%RUST_VERSION%%"
ENV CARGO_VERSION="%%CARGO_VERSION%%"
ENV CC="/usr/local/bin/gcc"
Expand Down
2 changes: 1 addition & 1 deletion rust-stable-image/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ LABEL org.opensuse.release-stage="released"

# endlabelprefix

RUN set -euo pipefail; zypper -n in --no-recommends rust1.70 cargo1.70 distribution-release; zypper -n clean; rm -rf /var/log/*
RUN set -euo pipefail; zypper -n in --no-recommends rust1.70 cargo1.70; zypper -n clean; rm -rf /var/log/*
ENV RUST_VERSION="%%RUST_VERSION%%"
ENV CARGO_VERSION="%%CARGO_VERSION%%"
ENV CC="/usr/local/bin/gcc"
Expand Down

0 comments on commit a1f0acf

Please sign in to comment.