FreeDV
/
freedv-gui
mirror of https://github.com/drowe67/freedv-gui.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Upgrade Docker container to Fedora 37.

pull/306/head
Mooneer Salem 2022-11-22 20:04:54 -08:00
parent 8344e72fde
commit eb09b9738b
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker/docker-compose-win.yml
View File

@ -1,7 +1,7 @@
version: "3" version: "3"
services: services:
fdv_win_fed_34_s: fdv_win_fed_37_s:
environment: environment:
- FDV_GIT_REPO - FDV_GIT_REPO
- FDV_GIT_BRANCH - FDV_GIT_BRANCH
@ -11,12 +11,12 @@ services:
build: build:
context: fdv_win_fedora context: fdv_win_fedora
args: args:
- FED_REL=34 - FED_REL=37
image: fdv_win_fed34_i image: fdv_win_fed37_i
container_name: 'fdv_win_fed34_c' container_name: 'fdv_win_fed37_c'
volumes: volumes:
- win_fed34_v:/home/build/ - win_fed37_v:/home/build/
volumes: volumes:
win_fed34_v: win_fed37_v:

4
docker/fdv_win_fedora/Dockerfile
View File

@ -1,4 +1,4 @@
ARG FED_REL=34 ARG FED_REL=37
FROM fedora:${FED_REL} FROM fedora:${FED_REL}
@ -8,7 +8,7 @@ FROM fedora:${FED_REL}
# tar: bzip2 # tar: bzip2
# arm-none-eabi-gdb: ncurses-compat-libs # 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 # specific for windows mingw build
RUN dnf install -y dnf-plugins-core RUN dnf install -y dnf-plugins-core

2
docker/freedv_build_windows.sh
View File

@ -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 docker-compose -f docker-compose-win.yml up --remove-orphans >> $log
package_docker_path=$(cat $log | sed -n "s/.*package: \(.*exe\) .*/\1/p") package_docker_path=$(cat $log | sed -n "s/.*package: \(.*exe\) .*/\1/p")
echo $package_docker_path echo $package_docker_path
docker cp fdv_win_fed34_c:$package_docker_path . docker cp fdv_win_fed37_c:$package_docker_path .