Skip to content

Commit 4297247

Browse files
committed
Push manylinux image to docker hub
1 parent 66371ef commit 4297247

File tree

3 files changed

+12
-36
lines changed

3 files changed

+12
-36
lines changed

.github/workflows/main.yml

+3-27
Original file line numberDiff line numberDiff line change
@@ -129,30 +129,6 @@ jobs:
129129
large-packages: false
130130
swap-storage: true
131131
- name: Build image
132-
run: docker build -f ./Dockerfile-manylinux2.28 -t aymara/qhttpserver-manylinux2.28:build .
133-
- name: Extract package and version number from docker image
134-
id: extract
135-
shell: bash
136-
run: |
137-
dockerImage="aymara/qhttpserver-manylinux2.28:build"
138-
packageDir="/usr/share/apps/qhttpserver/packages/"
139-
cicd/extract_package.sh $dockerImage $packageDir $GITHUB_OUTPUT
140-
- name: Upload nightly build package
141-
if: ${{ !startsWith(github.ref, 'refs/tags/') }}
142-
shell: bash
143-
run: |
144-
tagName=${{ steps.extract.outputs.version }}-nightly
145-
gh release create --prerelease ${tagName} || /bin/true
146-
gh release upload ${tagName} --clobber ./${{ steps.extract.outputs.filename }}
147-
env:
148-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
149-
- name: Upload release package
150-
uses: softprops/action-gh-release@v1
151-
if: ${{ startsWith(github.ref, 'refs/tags/') }}
152-
with:
153-
name: ${{ steps.extract.outputs.version }}
154-
files: |
155-
./${{ steps.extract.outputs.filename }}
156-
env:
157-
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
158-
132+
run: docker build -f ./Dockerfile-manylinux2.28 -t aymara/qhttpserver-manylinux2.28-qt${QT_VERSION}:latest .
133+
- name: "Push image"
134+
run: docker push aymara/qhttpserver-manylinux2.28-qt${QT_VERSION}:latest

Dockerfile-debian12

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ RUN echo "export packagefile=`find /src/qhttpserver/build/ -maxdepth 1 -name *.d
1818
RUN echo "export fullname=\$(basename -- \$packagefile)" >> /envfile
1919
RUN echo "export extension=\${fullname##*.}" >> /envfile
2020
RUN echo "export filename=\${fullname%.*}" >> /envfile
21-
RUN . /envfile && install -D ${packagefile} "/usr/share/apps/qhttpserver/packages/${filename}-debian12.deb"
21+
RUN . /envfile && install -D ${packagefile} "/usr/share/apps/qhttpserver/packages/${filename}-debian12r.deb"
2222

2323
## install github-release to be able to deploy packages
2424
#RUN wget https://github.com/aktau/github-release/releases/download/v0.7.2/linux-amd64-github-release.tar.bz2 && tar xjf linux-amd64-github-release.tar.bz2 && cp bin/linux/amd64/github-release /usr/bin

Dockerfile-manylinux2.28

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ RUN install -d /src/qhttpserver/build
2424

2525
# Build
2626
WORKDIR /src/qhttpserver/build
27-
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
28-
RUN ninja all && ninja package
29-
RUN echo "export packagefile=`find /src/qhttpserver/build/ -maxdepth 1 -name *.tar.gz`" > /envfile
30-
RUN echo "export fullname=\$(basename -- \$packagefile)" >> /envfile
31-
RUN echo "export extension=\${fullname##*.}" >> /envfile
32-
RUN echo "export filename=\${fullname%.*}" >> /envfile
33-
RUN cat /envfile
34-
RUN source /envfile && install -D ${packagefile} "/usr/share/apps/qhttpserver/packages/${filename}-manylinux_2_28.deb"
27+
RUN cmake -G Ninja -DCMAKE_INSTALL_PREFIX=/opt/qhttpserver -DCMAKE_BUILD_TYPE=Release ..
28+
RUN ninja all && ninja install
29+
#RUN echo "export packagefile=`find /src/qhttpserver/build/ -maxdepth 1 -name *.tar.gz`" > /envfile
30+
#RUN echo "export fullname=\$(basename -- \$packagefile)" >> /envfile
31+
#RUN echo "export extension=\${fullname##*.}" >> /envfile
32+
#RUN echo "export filename=\${fullname%.*}" >> /envfile
33+
#RUN cat /envfile
34+
#RUN source /envfile && install -D ${packagefile} "/usr/share/apps/qhttpserver/packages/${filename}-manylinux_2_28.deb"
3535

3636

0 commit comments

Comments
 (0)