diff --git a/Dockerfiles/ca-certs/README.md b/Dockerfiles/ca-certs/README.md new file mode 100644 index 0000000..edd38be --- /dev/null +++ b/Dockerfiles/ca-certs/README.md @@ -0,0 +1,5 @@ +# CA Certificate Chains + +Add any PEM formated CA certification chain to this directory with an extension +of '.cert'. If the docker file supports importing CA chains, it will add them +to the container's system CA store. diff --git a/Dockerfiles/generic-oe64 b/Dockerfiles/generic-oe64 index 5cba380..3c5f59a 100644 --- a/Dockerfiles/generic-oe64 +++ b/Dockerfiles/generic-oe64 @@ -15,6 +15,10 @@ RUN apt-get update && \ RUN curl https://storage.googleapis.com/git-repo-downloads/repo > /usr/local/bin/repo && \ chmod a+x /usr/local/bin/repo +# This copy will include README, but update should ignore +ADD ca-certs/* /usr/local/share/ca-certificates/ +RUN update-ca-certificates + RUN useradd -Ums /bin/bash -l -p build -u [UID] build && \ usermod -aG sudo build RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \ diff --git a/Dockerfiles/openxt-bullseye-oe64 b/Dockerfiles/openxt-bullseye-oe64 index e111e0e..6f1af32 100644 --- a/Dockerfiles/openxt-bullseye-oe64 +++ b/Dockerfiles/openxt-bullseye-oe64 @@ -46,6 +46,10 @@ RUN useradd -Ums /bin/bash -l -p '""' -u $UID $UNAME ADD files/quiltrc /home/$UNAME/.quiltrc ADD files/oxt-patch.header /home/$UNAME/oxt-patch.header +# This copy will include README, but update should ignore +ADD ca-certs/* /usr/local/share/ca-certificates/ +RUN update-ca-certificates + RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \ locale-gen ENV LANG en_US.utf8 diff --git a/Dockerfiles/openxt-buster-oe64 b/Dockerfiles/openxt-buster-oe64 index 41b4b06..8ad1d22 100644 --- a/Dockerfiles/openxt-buster-oe64 +++ b/Dockerfiles/openxt-buster-oe64 @@ -57,6 +57,11 @@ ADD files/oxt-patch.header /home/$UNAME/oxt-patch.header RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \ locale-gen ENV LANG en_US.utf8 + +# This copy will include README, but update should ignore +ADD ca-certs/* /usr/local/share/ca-certificates/ +RUN update-ca-certificates + USER $UNAME WORKDIR /home/$UNAME ENTRYPOINT ["/bin/bash"] diff --git a/Dockerfiles/openxt-oe64 b/Dockerfiles/openxt-oe64 index c210059..9b26072 100644 --- a/Dockerfiles/openxt-oe64 +++ b/Dockerfiles/openxt-oe64 @@ -51,6 +51,10 @@ RUN useradd -Ums /bin/bash -l -p '""' -G sudo -u $UID $UNAME ADD files/quiltrc /home/$UNAME/.quiltrc ADD files/oxt-patch.header /home/$UNAME/oxt-patch.header +# This copy will include README, but update should ignore +ADD ca-certs/* /usr/local/share/ca-certificates/ +RUN update-ca-certificates + RUN echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && \ locale-gen ENV LANG en_US.utf8