Skip to content

Commit

Permalink
Merge pull request #356 from avm/docker-dev-env
Browse files Browse the repository at this point in the history
Dockerfile: make a separate stage for build deps.
  • Loading branch information
blackav authored Sep 18, 2024
2 parents 3e5e9a8 + 402f3b3 commit b133fc0
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 8 deletions.
8 changes: 7 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
FROM fedora:38 AS builder
FROM fedora:40 AS dependencies

RUN dnf -y update && dnf -y install mongo-c-driver-devel libbson-devel httpd httpd-devel httpd-tools net-tools wget tar bzip2 p7zip fuse-devel htop make gcc glibc-devel glibc-static bison flex gawk sed file zlib zlib-devel ncurses ncurses-devel expat expat-devel gettext gettext-devel libzip libzip-devel libcurl libcurl-devel libuuid libuuid-devel openssl openssl-devel git bc vim wget fuse-sshfs kernel-tools gcc strace valgrind gcc-c++ libstdc++-static python python3 nasm libstdc++-devel glibc-devel.i686 glibc-static.i686 libstdc++-devel.i686 libstdc++-static.i686 libtool autoconf automake clang clang-devel clang-libs python2 pypy pypy3 rust nodejs swift-lang mariadb-connector-c-devel mariadb-server-utils mariadb-common mariadb-errmsg glibc-locale-source golang gdb elfutils-libelf-devel procps hiredis-devel

RUN dnf clean all

FROM dependencies AS build

WORKDIR /app
COPY . /app
Expand Down
8 changes: 1 addition & 7 deletions docker/build.sh
Original file line number Diff line number Diff line change
@@ -1,12 +1,6 @@
#! /bin/bash

set -ex

dnf -y update && dnf -y install mongo-c-driver-devel libbson-devel httpd httpd-devel httpd-tools net-tools wget tar bzip2 p7zip fuse-devel htop make gcc glibc-devel glibc-static bison flex gawk sed file zlib zlib-devel ncurses ncurses-devel expat expat-devel gettext gettext-devel libzip libzip-devel libcurl libcurl-devel libuuid libuuid-devel openssl openssl-devel git bc vim wget fuse-sshfs kernel-tools gcc strace valgrind gcc-c++ libstdc++-static python python3 nasm libstdc++-devel glibc-devel.i686 glibc-static.i686 libstdc++-devel.i686 libstdc++-static.i686 libtool autoconf automake clang clang-devel clang-libs python2 pypy pypy3 rust nodejs swift-lang mariadb-connector-c-devel mariadb-server-utils mariadb-common mariadb-errmsg glibc-locale-source golang gdb elfutils-libelf-devel procps hiredis-devel

dnf clean all

set +e
set -x

localedef -v -c -i ru_RU -f UTF-8 ru_RU.UTF-8

Expand Down

0 comments on commit b133fc0

Please sign in to comment.