proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-09 04:16:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

contrib: Don't declare OS variable in docker run command (Fixes: #413)

Browse Source 
Since the containers are ephemeral just declare directly in the Dockerfile
This also simplifies the run command for users building fwupd
This commit is contained in:
Mario Limonciello 2018-02-21 09:48:30 -06:00 committed by Mario Limonciello
parent d838ae045f
commit a0f9f619ca
6 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -17,4 +17,4 @@ install:
- ./contrib/ci/generate_docker.py - ./contrib/ci/generate_docker.py
script: script:
- docker run -e OS=$OS -e CI=true -t -v `pwd`/dist:/build/dist fwupd-$OS - docker run -e CI=true -t -v `pwd`/dist:/build/dist fwupd-$OS

1
contrib/ci/Dockerfile-arch.in
View File

@ -1,4 +1,5 @@
FROM archlinux/base FROM archlinux/base
%%%OS%%%
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
ENV LC_ALL en_US.UTF-8 ENV LC_ALL en_US.UTF-8
RUN echo fubar > /etc/machine-id RUN echo fubar > /etc/machine-id

1
contrib/ci/Dockerfile-debian.in
View File

@ -1,4 +1,5 @@
FROM %%%ARCH_PREFIX%%%debian:testing FROM %%%ARCH_PREFIX%%%debian:testing
%%%OS%%%
RUN echo fubar > /etc/machine-id RUN echo fubar > /etc/machine-id
%%%ARCH_SPECIFIC_COMMAND%%% %%%ARCH_SPECIFIC_COMMAND%%%
%%%INSTALL_DEPENDENCIES_COMMAND%%% %%%INSTALL_DEPENDENCIES_COMMAND%%%

1
contrib/ci/Dockerfile-fedora.in
View File

@ -1,4 +1,5 @@
FROM fedora:26 FROM fedora:26
%%%OS%%%
ENV LANG en_US.UTF-8 ENV LANG en_US.UTF-8
ENV LANGUAGE en_US:en ENV LANGUAGE en_US:en
ENV LC_ALL en_US.UTF-8 ENV LC_ALL en_US.UTF-8

1
contrib/ci/Dockerfile-ubuntu.in
View File

@ -1,4 +1,5 @@
FROM ubuntu:devel FROM ubuntu:devel
%%%OS%%%
RUN echo fubar > /etc/machine-id RUN echo fubar > /etc/machine-id
%%%ARCH_SPECIFIC_COMMAND%%% %%%ARCH_SPECIFIC_COMMAND%%%
%%%INSTALL_DEPENDENCIES_COMMAND%%% %%%INSTALL_DEPENDENCIES_COMMAND%%%

2
contrib/ci/generate_docker.py
View File

@ -103,6 +103,8 @@ with open(out.name, 'w') as wfd:
wfd.write('RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list\n') wfd.write('RUN cat /etc/apt/sources.list | sed "s/deb/deb-src/" >> /etc/apt/sources.list\n')
#add new architecture #add new architecture
wfd.write('RUN dpkg --add-architecture %s\n' % SUBOS) wfd.write('RUN dpkg --add-architecture %s\n' % SUBOS)
elif line == "%%%OS%%%\n":
wfd.write("ENV OS %s\n" % TARGET)
else: else:
wfd.write(line) wfd.write(line)
wfd.flush() wfd.flush()