add make and build tools to image

This commit is contained in:
TomPallister 2020-11-20 11:57:34 +00:00
parent 7254d4d1fb
commit 1c6bfc3314
3 changed files with 37 additions and 35 deletions

View File

@ -7,3 +7,5 @@ RUN apt install -y dirmngr gnupg apt-transport-https ca-certificates software-pr
RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
RUN apt-add-repository 'deb https://download.mono-project.com/repo/ubuntu stable-focal main' RUN apt-add-repository 'deb https://download.mono-project.com/repo/ubuntu stable-focal main'
RUN apt install -y mono-devel RUN apt install -y mono-devel
RUN apt install -y make
RUN apt install -y build-essential

View File

@ -1,15 +1,15 @@
# call from ocelot repo root with # call from ocelot repo root with
# docker build --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build . # docker build --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.build .
FROM mijitt0m/ocelot-build:0.0.1 FROM mijitt0m/ocelot-build:0.0.2
ARG OCELOT_COVERALLS_TOKEN ARG OCELOT_COVERALLS_TOKEN
ENV OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN ENV OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN
WORKDIR /src WORKDIR /src
COPY ./. . COPY ./. .
RUN chmod u+x build.sh RUN chmod u+x build.sh
RUN make build RUN make build

View File

@ -1,20 +1,20 @@
# call from ocelot repo root with # call from ocelot repo root with
# docker build --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN --build-arg OCELOT_GITHUB_API_KEY=$OCELOT_GITHUB_API_KEY --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.release . # docker build --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN --build-arg OCELOT_GITHUB_API_KEY=$OCELOT_GITHUB_API_KEY --build-arg OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN -f ./docker/Dockerfile.release .
FROM mijitt0m/ocelot-build:0.0.1 FROM mijitt0m/ocelot-build:0.0.2
ARG OCELOT_COVERALLS_TOKEN ARG OCELOT_COVERALLS_TOKEN
ARG OCELOT_NUTGET_API_KEY ARG OCELOT_NUTGET_API_KEY
ARG OCELOT_GITHUB_API_KEY ARG OCELOT_GITHUB_API_KEY
ENV OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN ENV OCELOT_COVERALLS_TOKEN=$OCELOT_COVERALLS_TOKEN
ENV OCELOT_NUTGET_API_KEY=$OCELOT_NUTGET_API_KEY ENV OCELOT_NUTGET_API_KEY=$OCELOT_NUTGET_API_KEY
ENV OCELOT_GITHUB_API_KEY=$OCELOT_GITHUB_API_KEY ENV OCELOT_GITHUB_API_KEY=$OCELOT_GITHUB_API_KEY
WORKDIR /src WORKDIR /src
COPY ./. . COPY ./. .
RUN chmod u+x build.sh RUN chmod u+x build.sh
RUN make release RUN make release