mirror of
				https://github.com/Z3Prover/z3
				synced 2025-11-04 05:19:11 +00:00 
			
		
		
		
	add main remaining updates from #1815
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
		
							parent
							
								
									5cdbb1f7be
								
							
						
					
					
						commit
						785fe2f6f7
					
				
					 7 changed files with 76 additions and 158 deletions
				
			
		| 
						 | 
				
			
			@ -32,7 +32,6 @@ RUN apt-get update && \
 | 
			
		|||
        libomp-dev \
 | 
			
		||||
        llvm-3.9 \
 | 
			
		||||
        make \
 | 
			
		||||
        mono-devel \
 | 
			
		||||
        ninja-build \
 | 
			
		||||
        python3 \
 | 
			
		||||
        python3-setuptools \
 | 
			
		||||
| 
						 | 
				
			
			@ -48,5 +47,6 @@ RUN useradd -m user && \
 | 
			
		|||
    echo 'user  ALL=(root) NOPASSWD: ALL' >> /etc/sudoers
 | 
			
		||||
USER user
 | 
			
		||||
WORKDIR /home/user
 | 
			
		||||
# dotnet core doesn't support x86
 | 
			
		||||
# TODO .NET core does not support Linux x86 yet, disable it for now.
 | 
			
		||||
# see: https://github.com/dotnet/coreclr/issues/9265
 | 
			
		||||
ENV ASAN_SYMBOLIZER_PATH=/usr/lib/llvm-3.9/bin/llvm-symbolizer DOTNET_BINDINGS=0
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,9 +2,10 @@ FROM ubuntu:14.04
 | 
			
		|||
 | 
			
		||||
RUN apt-get update && \
 | 
			
		||||
    apt-get -y --no-install-recommends install \
 | 
			
		||||
        apt-transport-https \
 | 
			
		||||
        binutils \
 | 
			
		||||
        clang-3.9 \
 | 
			
		||||
        cmake \
 | 
			
		||||
        curl \
 | 
			
		||||
        doxygen \
 | 
			
		||||
        default-jdk \
 | 
			
		||||
        gcc-multilib \
 | 
			
		||||
| 
						 | 
				
			
			@ -18,13 +19,20 @@ RUN apt-get update && \
 | 
			
		|||
        lib32gomp1 \
 | 
			
		||||
        llvm-3.9 \
 | 
			
		||||
        make \
 | 
			
		||||
        mono-devel \
 | 
			
		||||
        ninja-build \
 | 
			
		||||
        python3 \
 | 
			
		||||
        python3-setuptools \
 | 
			
		||||
        python2.7 \
 | 
			
		||||
        python-setuptools
 | 
			
		||||
 | 
			
		||||
RUN curl -SL https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb --output packages-microsoft-prod.deb && \
 | 
			
		||||
    dpkg -i packages-microsoft-prod.deb && \
 | 
			
		||||
    apt-get update && \
 | 
			
		||||
    apt-get -y --no-install-recommends install dotnet-sdk-2.1
 | 
			
		||||
 | 
			
		||||
RUN curl -SL https://cmake.org/files/v3.12/cmake-3.12.0-Linux-x86_64.sh --output cmake-3.12.0-Linux-x86_64.sh && \
 | 
			
		||||
    sh cmake-3.12.0-Linux-x86_64.sh --prefix=/usr/local --exclude-subdir
 | 
			
		||||
 | 
			
		||||
# Create `user` user for container with password `user`.  and give it
 | 
			
		||||
# password-less sudo access
 | 
			
		||||
RUN useradd -m user && \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -2,10 +2,12 @@ FROM ubuntu:16.04
 | 
			
		|||
 | 
			
		||||
RUN apt-get update && \
 | 
			
		||||
    apt-get -y --no-install-recommends install \
 | 
			
		||||
        apt-transport-https \
 | 
			
		||||
        binutils \
 | 
			
		||||
        clang \
 | 
			
		||||
        clang-3.9 \
 | 
			
		||||
        cmake \
 | 
			
		||||
        curl \
 | 
			
		||||
        doxygen \
 | 
			
		||||
        default-jdk \
 | 
			
		||||
        gcc-multilib \
 | 
			
		||||
| 
						 | 
				
			
			@ -20,7 +22,6 @@ RUN apt-get update && \
 | 
			
		|||
        libomp-dev \
 | 
			
		||||
        llvm-3.9 \
 | 
			
		||||
        make \
 | 
			
		||||
        mono-devel \
 | 
			
		||||
        ninja-build \
 | 
			
		||||
        python3 \
 | 
			
		||||
        python3-setuptools \
 | 
			
		||||
| 
						 | 
				
			
			@ -28,6 +29,11 @@ RUN apt-get update && \
 | 
			
		|||
        python-setuptools \
 | 
			
		||||
        sudo
 | 
			
		||||
 | 
			
		||||
RUN curl -SL https://packages.microsoft.com/config/ubuntu/16.04/packages-microsoft-prod.deb --output packages-microsoft-prod.deb && \
 | 
			
		||||
    dpkg -i packages-microsoft-prod.deb && \
 | 
			
		||||
    apt-get update && \
 | 
			
		||||
    apt-get -y --no-install-recommends install dotnet-sdk-2.1
 | 
			
		||||
 | 
			
		||||
# Create `user` user for container with password `user`.  and give it
 | 
			
		||||
# password-less sudo access
 | 
			
		||||
RUN useradd -m user && \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue