-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into remove-sources
- Loading branch information
Showing
65 changed files
with
1,017 additions
and
498 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
export BASE_VERSION=22.04 | ||
export BUILD_ID=$(date +%Y%m%d) | ||
export KOLLA_TYPE= | ||
export BASE_VERSION=22.04 |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} | ||
{% block labels %} | ||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" | ||
{% endblock %} | ||
|
||
{% block nova_spicehtml5proxy_header %}{% endblock %} | ||
|
||
{% import "macros.j2" as macros with context %} | ||
|
||
{% set nova_spicehtml5proxy_packages = [ | ||
'websockify' | ||
] %} | ||
|
||
RUN git clone https://gitlab.freedesktop.org/spice/spice-html5.git/ /usr/share/spice-html5 \ | ||
&& rm -rf \ | ||
/usr/share/spice-html5/.git \ | ||
/usr/share/spice-html5/COPYING \ | ||
/usr/share/spice-html5/COPYING.LESSER \ | ||
/usr/share/spice-html5/Makefile \ | ||
/usr/share/spice-html5/README \ | ||
/usr/share/spice-html5/TODO \ | ||
/usr/share/spice-html5/apache.conf.sample \ | ||
/usr/share/spice-html5/package.json.in \ | ||
/usr/share/spice-html5/spice-html5.spec.in | ||
|
||
{{ macros.install_packages(nova_spicehtml5proxy_packages | customizable("packages")) }} | ||
|
||
{% block nova_spicehtml5proxy_footer %}{% endblock %} | ||
{% block footer %}{% endblock %} | ||
|
||
USER nova |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} | ||
{% block labels %} | ||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" | ||
{% endblock %} | ||
|
||
{% block nova_spicehtml5proxy_header %}{% endblock %} | ||
|
||
{% import "macros.j2" as macros with context %} | ||
|
||
{% set nova_spicehtml5proxy_packages = [ | ||
'websockify' | ||
] %} | ||
|
||
RUN git clone https://gitlab.freedesktop.org/spice/spice-html5.git/ /usr/share/spice-html5 \ | ||
&& rm -rf \ | ||
/usr/share/spice-html5/.git \ | ||
/usr/share/spice-html5/COPYING \ | ||
/usr/share/spice-html5/COPYING.LESSER \ | ||
/usr/share/spice-html5/Makefile \ | ||
/usr/share/spice-html5/README \ | ||
/usr/share/spice-html5/TODO \ | ||
/usr/share/spice-html5/apache.conf.sample \ | ||
/usr/share/spice-html5/package.json.in \ | ||
/usr/share/spice-html5/spice-html5.spec.in | ||
|
||
{{ macros.install_packages(nova_spicehtml5proxy_packages | customizable("packages")) }} | ||
|
||
{% block nova_spicehtml5proxy_footer %}{% endblock %} | ||
{% block footer %}{% endblock %} | ||
|
||
USER nova |
Binary file not shown.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
FROM {{ namespace }}/{{ image_prefix }}nova-base:{{ tag }} | ||
{% block labels %} | ||
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" | ||
{% endblock %} | ||
|
||
{% block nova_spicehtml5proxy_header %}{% endblock %} | ||
|
||
{% import "macros.j2" as macros with context %} | ||
|
||
{% set nova_spicehtml5proxy_packages = [ | ||
'websockify' | ||
] %} | ||
|
||
RUN git clone https://gitlab.freedesktop.org/spice/spice-html5.git/ /usr/share/spice-html5 \ | ||
&& rm -rf \ | ||
/usr/share/spice-html5/.git \ | ||
/usr/share/spice-html5/COPYING \ | ||
/usr/share/spice-html5/COPYING.LESSER \ | ||
/usr/share/spice-html5/Makefile \ | ||
/usr/share/spice-html5/README \ | ||
/usr/share/spice-html5/TODO \ | ||
/usr/share/spice-html5/apache.conf.sample \ | ||
/usr/share/spice-html5/package.json.in \ | ||
/usr/share/spice-html5/spice-html5.spec.in | ||
|
||
{{ macros.install_packages(nova_spicehtml5proxy_packages | customizable("packages")) }} | ||
|
||
{% block nova_spicehtml5proxy_footer %}{% endblock %} | ||
{% block footer %}{% endblock %} | ||
|
||
USER nova |
Binary file not shown.
Binary file not shown.
Oops, something went wrong.