Skip to content

Commit 62d88bf

Browse files
committed
Various fixes changing from .gz to .xz
1 parent d867373 commit 62d88bf

File tree

3 files changed

+38
-6
lines changed

3 files changed

+38
-6
lines changed

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ RUN mkdir -p /usr/src/aiscm
3333
WORKDIR /usr/src/aiscm
3434
ADD debian/control debian/control
3535
RUN mk-build-deps --install --remove --tool 'apt-get -q --yes' debian/control
36-
COPY aiscm.tar.gz .
37-
COPY aiscm.tar.gz.asc .
36+
COPY aiscm.tar.xz .
37+
COPY aiscm.tar.xz.asc .
3838
ADD configure.ac .
3939
ADD debian debian
4040
ADD Makefile.package .

Makefile.package

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ VERSION=$(shell grep AC_INIT configure.ac | sed -e "s/.*\[\([0-9\.]*\)\].*/\1/")
22

33
# https://wiki.debian.org/IntroDebianPackaging
44
# https://en.opensuse.org/openSUSE:Build_Service_Tutorial
5-
package: aiscm.tar.gz aiscm.tar.gz.asc
5+
package: aiscm.tar.xz aiscm.tar.xz.asc
66
mkdir -p pkg
7-
cp aiscm.tar.gz pkg/aiscm_$(VERSION).orig.tar.gz
8-
cp aiscm.tar.gz.asc pkg/aiscm_$(VERSION).orig.tar.gz.asc
9-
tar xzf aiscm.tar.gz -C pkg
7+
cp aiscm.tar.xz pkg/aiscm_$(VERSION).orig.tar.xz
8+
cp aiscm.tar.xz.asc pkg/aiscm_$(VERSION).orig.tar.xz.asc
9+
tar xf aiscm.tar.xz -C pkg
1010
cp -a debian pkg/aiscm-$(VERSION)
1111
cd pkg/aiscm-$(VERSION) && debuild -us -uc -j4 && cd ../..

README.md

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,38 @@ sudo make install
6767
cd ..
6868
```
6969

70+
### Installation using Docker
71+
72+
Download the `.tar.xz` and the `.tar.xz.asc` files from the
73+
lastest [release](https://github.com/wedesoft/aiscm/releases) into the root folder of the cloned repository, then rename
74+
the files to `aiscm.tar.gz` and `aiscm.tar.gz.asc`, respectively.
75+
76+
Build the Docker image using the command below, where the second line just display some minimal information about the
77+
image. Note that the Docker build will take *some* time.
78+
79+
```Shell
80+
docker build --tag=aiscm .
81+
docker image ls aiscm
82+
```
83+
84+
Now can can start a shell within your running container using:
85+
86+
```Shell
87+
docker run -w /usr/src/aiscm/pkg/aiscm-{release-number} -it aiscm /bin/bash
88+
# e.g.: docker run -w /usr/src/aiscm/pkg/aiscm-0.18.1 -it aiscm /bin/bash
89+
```
90+
91+
Within the `tests` folder, you'll find that all unit tests have already been run; you might also have seen the
92+
respective log output during `docker build`. Integration tests are not yet completely running within Docker, but you can
93+
e.g. run one using:
94+
95+
```Shell
96+
cd tests/integration/
97+
make 2d_array.tmp
98+
```
99+
100+
See below for more information on running the tests.
101+
70102
## Run tests
71103

72104
### Unit tests

0 commit comments

Comments
 (0)