setup for initial setup

AllStarLink · Dec 22, 2023 · ddd30eb · ddd30eb
1 parent 922ac52
commit ddd30eb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 16 deletions.
diff --git a/.github/workflows/make_and_publish_pkgs.yml b/.github/workflows/make_and_publish_pkgs.yml
@@ -1,4 +1,3 @@
-
 name: make_and_publish_pkgs
 run-name: Package ${{ github.event.repository.name }}(${{ github.ref_name }}) for ${{ inputs.os }}/${{ inputs.arch }}, Publish to ${{ inputs.deployment-environment }}
 on: 
@@ -35,7 +34,7 @@ jobs:
   make-packages:
     uses: AllStarLink/asl_workflows/.github/workflows/ephemeral_ec2_run-this.yml@develop
     with:
-      run-this: ./docker/dockerbuild.sh -a ${{ inputs.arch  }} -o ${{ inputs.os }} ${{ (inputs.commit-versioning == 'yes' || (inputs.commit-versioning == 'default' && inputs.deployment-environment == 'development')) && '-r' || null }}
+      run-this: ./builder/dockerbuild.sh -a ${{ inputs.arch  }} -o ${{ inputs.os }} ${{ (inputs.commit-versioning == 'yes' || (inputs.commit-versioning == 'default' && inputs.deployment-environment == 'development')) && '-r' || null }}
       arch: ${{ inputs.arch == 'armhf' && 'arm64' || inputs.arch == 'amd64' && 'x86_64' || inputs.arch == 'riscv64' && 'x86_64' || inputs.arch }}
       artifact-path: 'build/*'
     secrets: inherit

diff --git a/builder/Dockerfile b/builder/Dockerfile
@@ -18,26 +18,16 @@ RUN apt-get update && apt-get -y install \
     devscripts \
     fakeroot \
     debhelper \
-    automake \
-    autotools-dev \
-    pkg-config \
     git \
     ca-certificates \
     wget \
     --no-install-recommends
 
-# add the allstarlink repo for build deps
-RUN echo "deb https://apt.allstarlink.org/repos/$ASL_REPO $OS main" > /etc/apt/sources.list.d/allstarlink.list
-RUN wget -O - https://apt.allstarlink.org/repos/repo_signing.gpg | apt-key add -
-
 # Install application dependencies
 RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
-    debhelper quilt zlib1g-dev libgsm1-dev libssl-dev libtonezone-dev libasound2-dev libpq-dev unixodbc-dev libpri-dev libvpb-dev asl-dahdi-source autotools-dev libnewt-dev libspeex-dev libspeexdsp-dev graphviz libcurl4-openssl-dev doxygen gsfonts libpopt-dev libiksemel-dev freetds-dev libvorbis-dev libsnmp-dev libcap-dev libi2c-dev libjansson-dev libusb-dev\
+    debhelper quilt pandoc debhelper-compat \
     --no-install-recommends
 
-# Install libreadline dependency - transition to libeditreadline-dev for bullseye
-RUN apt-get -y install libreadline-gplv2-dev || apt-get -y install libeditreadline-dev
-
 # Import entrypoint script
 COPY ./entrypoint.sh /entrypoint.sh
 

diff --git a/builder/dockerbuild.sh b/builder/dockerbuild.sh
@@ -97,9 +97,9 @@ for A in $ARCHS; do
     DA="$A"
   fi
   for O in $OPERATING_SYSTEMS; do
-       docker build -f $DIR/Dockerfile -t asl-asterisk_builder.$O.$A$REPO_ENV --build-arg ARCH="$DA" --build-arg OS="$O" --build-arg ASL_REPO="asl_builds${REPO_ENV}" --build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g) $DIR
-       docker run -v $PDIR:/src -e DPKG_BUILDOPTS="$DPKG_BUILDOPTS" -e BUILD_TARGETS="$BUILD_TARGETS" -e COMMIT_VERSIONING="$COMMIT_VERSIONING" asl-asterisk_builder.$O.$A$REPO_ENV
-       docker image rm --force asl-asterisk_builder.$O.$A$REPO_ENV
+       docker build -f $DIR/Dockerfile -t allmon3_builder.$O.$A$REPO_ENV --build-arg ARCH="$DA" --build-arg OS="$O" --build-arg ASL_REPO="asl_builds${REPO_ENV}" --build-arg USER_ID=$(id -u) --build-arg GROUP_ID=$(id -g) $DIR
+       docker run -v $PDIR:/src -e DPKG_BUILDOPTS="$DPKG_BUILDOPTS" -e BUILD_TARGETS="$BUILD_TARGETS" -e COMMIT_VERSIONING="$COMMIT_VERSIONING" allmon3_builder.$O.$A$REPO_ENV
+       docker image rm --force allmon3_builder.$O.$A$REPO_ENV
        DPKG_BUILDOPTS="--build=any -uc -us"
   done
 done