Mirrors/nushell
2
0
Fork 0
mirror of https://github.com/nushell/nushell synced 2024-12-27 05:23:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #655 from vsoch/update/docker-base-18.04

Browse source 
Updating nushell/nu base to have proper version of libssl-dev
This commit is contained in:
Jonathan Turner 2019-09-13 07:25:51 +12:00 committed by GitHub
commit 4dfebae136
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.circleci/config.yml
View file

@ -52,6 +52,11 @@ workflows:
command: | command: |
DOCKER_TAG=$(docker run quay.io/nushell/nu --version | cut -d' ' -f2) DOCKER_TAG=$(docker run quay.io/nushell/nu --version | cut -d' ' -f2)
echo "Version that would be used for Docker tag is v${DOCKER_TAG}" echo "Version that would be used for Docker tag is v${DOCKER_TAG}"
- run:
name: Test Executable
command: |
docker run --rm quay.io/nushell/nu-base --help
docker run --rm quay.io/nushell/nu --help
# workflow publishes to Docker Hub, with each job having different triggers # workflow publishes to Docker Hub, with each job having different triggers
build_with_deploy: build_with_deploy:
@ -77,6 +82,11 @@ workflows:
name: Build Multistage (smaller) container name: Build Multistage (smaller) container
command: | command: |
docker build -f docker/Dockerfile -t quay.io/nushell/nu . docker build -f docker/Dockerfile -t quay.io/nushell/nu .
- run:
name: Test Executable
command: |
docker run --rm quay.io/nushell/nu --help
docker run --rm quay.io/nushell/nu-base --help
- run: - run:
name: Publish Docker Tag with Nushell Version name: Publish Docker Tag with Nushell Version
command: | command: |
@ -109,6 +119,11 @@ workflows:
name: Build Multistage (smaller) container name: Build Multistage (smaller) container
command: | command: |
docker build --build-arg FROMTAG=devel -f docker/Dockerfile -t quay.io/nushell/nu:devel . docker build --build-arg FROMTAG=devel -f docker/Dockerfile -t quay.io/nushell/nu:devel .
- run:
name: Test Executable
command: |
docker run --rm quay.io/nushell/nu:devel --help
docker run --rm quay.io/nushell/nu-base:devel --help
- run: - run:
name: Publish Development Docker Tags name: Publish Development Docker Tags
command: | command: |
@ -138,6 +153,11 @@ workflows:
name: Build Multistage (smaller) container name: Build Multistage (smaller) container
command: | command: |
docker build -f docker/Dockerfile -t quay.io/nushell/nu:nightly . docker build -f docker/Dockerfile -t quay.io/nushell/nu:nightly .
- run:
name: Test Executable
command: |
docker run --rm quay.io/nushell/nu:nightly --help
docker run --rm quay.io/nushell/nu-base:nightly --help
- run: - run:
name: Publish Nightly Nushell Containers name: Publish Nightly Nushell Containers
command: | command: |

9
docker/Dockerfile
View file

@ -1,8 +1,9 @@
ARG FROMTAG=latest ARG FROMTAG=latest
FROM quay.io/nushell/nu-base:${FROMTAG} as base FROM quay.io/nushell/nu-base:${FROMTAG} as base
FROM rust:1.37-slim FROM ubuntu:18.04
COPY --from=base /usr/local/bin/nu /usr/local/bin/nu COPY --from=base /usr/local/bin/nu /usr/local/bin/nu
RUN apt-get update && \ ENV DEBIAN_FRONTEND noninteractive
apt-get install -y pkg-config libssl-dev RUN apt-get update && apt-get install -y libssl-dev \
pkg-config
ENTRYPOINT ["nu"] ENTRYPOINT ["nu"]
CMD ["-l", "info"] CMD ["-l", "info"]

2
docker/Dockerfile.nu-base
View file

@ -6,8 +6,6 @@ FROM ubuntu:16.04
ENV DEBIAN_FRONTEND noninteractive ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get install -y libssl-dev \ RUN apt-get update && apt-get install -y libssl-dev \
libxcb-composite0-dev \ libxcb-composite0-dev \
libx11-dev \
libssl-dev \
pkg-config \ pkg-config \
curl curl