diff --git a/docker/docker-compose-win.yml b/docker/docker-compose-win.yml index 6878a5a3..9d1239d8 100644 --- a/docker/docker-compose-win.yml +++ b/docker/docker-compose-win.yml @@ -1,7 +1,7 @@ version: "3" services: - fdv_win_fed_34_s: + fdv_win_fed_37_s: environment: - FDV_GIT_REPO - FDV_GIT_BRANCH @@ -11,12 +11,12 @@ services: build: context: fdv_win_fedora args: - - FED_REL=34 + - FED_REL=37 - image: fdv_win_fed34_i - container_name: 'fdv_win_fed34_c' + image: fdv_win_fed37_i + container_name: 'fdv_win_fed37_c' volumes: - - win_fed34_v:/home/build/ + - win_fed37_v:/home/build/ volumes: - win_fed34_v: + win_fed37_v: diff --git a/docker/fdv_win_fedora/Dockerfile b/docker/fdv_win_fedora/Dockerfile index 7b5b04fc..a90f4b26 100644 --- a/docker/fdv_win_fedora/Dockerfile +++ b/docker/fdv_win_fedora/Dockerfile @@ -1,4 +1,4 @@ -ARG FED_REL=34 +ARG FED_REL=37 FROM fedora:${FED_REL} @@ -8,7 +8,7 @@ FROM fedora:${FED_REL} # tar: bzip2 # arm-none-eabi-gdb: ncurses-compat-libs -RUN dnf -y install --setopt=install_weak_deps=False @development-tools cmake git speexdsp-devel libsamplerate-devel octave octave-signal gnuplot sox python3-numpy automake libtool libusb1-devel wget bc glibc.i686 which bzip2 ncurses-compat-libs gcc gcc-c++ diffutils && useradd -m build +RUN dnf -y install --setopt=install_weak_deps=False @development-tools cmake git speexdsp-devel libsamplerate-devel octave octave-signal gnuplot sox python3-numpy automake libtool libusb1-devel wget bc glibc.i686 which bzip2 gcc gcc-c++ diffutils && useradd -m build # specific for windows mingw build RUN dnf install -y dnf-plugins-core diff --git a/docker/freedv_build_windows.sh b/docker/freedv_build_windows.sh index 7c7c8882..4937b346 100755 --- a/docker/freedv_build_windows.sh +++ b/docker/freedv_build_windows.sh @@ -102,4 +102,4 @@ FDV_CLEAN=$FDV_CLEAN FDV_BOOTSTRAP_WX=$FDV_BOOTSTRAP_WX FDV_CMAKE=$FDV_CMAKE FDV docker-compose -f docker-compose-win.yml up --remove-orphans >> $log package_docker_path=$(cat $log | sed -n "s/.*package: \(.*exe\) .*/\1/p") echo $package_docker_path -docker cp fdv_win_fed34_c:$package_docker_path . +docker cp fdv_win_fed37_c:$package_docker_path .