* Rename Dockerfile to Containerfile
* Simplify build automation (I never use Docker)
This commit is contained in:
parent
c4068fa956
commit
767a7cc91a
14
README.md
14
README.md
|
@ -1,8 +1,8 @@
|
||||||
# Dockerfile for AmigaOS Cross-Compiler Toolchain
|
# Containerfile for AmigaOS Cross-Compiler Toolchain
|
||||||
|
|
||||||
`Dockerfile` for [Stefan "Bebbo" Franke](https://github.com/bebbo)'s [amiga-gcc](https://github.com/bebbo/amiga-gcc) toolchain for Linux/AmigaOS cross-development.
|
`Containerfile` for [Stefan "Bebbo" Franke](https://github.com/bebbo)'s [amiga-gcc](https://github.com/bebbo/amiga-gcc) toolchain for Linux/AmigaOS cross-development.
|
||||||
|
|
||||||
A ready-to-use image built from this Dockerfile is available on [Docker Hub](https://hub.docker.com/r/sebastianbergmann/amiga-gcc/).
|
A ready-to-use image built from this Containerfile is available on [Docker Hub](https://hub.docker.com/r/sebastianbergmann/amiga-gcc/).
|
||||||
|
|
||||||
More information can be found [here](https://amiga.sebastian-bergmann.de/presentations/2017/evoke/amiga-software-development-in-2017).
|
More information can be found [here](https://amiga.sebastian-bergmann.de/presentations/2017/evoke/amiga-software-development-in-2017).
|
||||||
|
|
||||||
|
@ -53,14 +53,14 @@ int main()
|
||||||
### Compilation
|
### Compilation
|
||||||
|
|
||||||
```
|
```
|
||||||
$ docker run -v $HOME:/host -it sebastianbergmann/amiga-gcc \
|
$ podman run -v $HOME:/host -it sebastianbergmann/amiga-gcc \
|
||||||
m68k-amigaos-gcc /host/hello.c -o /host/hello -noixemul
|
m68k-amigaos-gcc /host/hello.c -o /host/hello -noixemul
|
||||||
```
|
```
|
||||||
|
|
||||||
|
|
||||||
### Execution
|
### Execution
|
||||||
|
|
||||||
#### Docker-ized Emulation using FS-UAE
|
#### Container-ized Emulation using FS-UAE
|
||||||
|
|
||||||
The `docker-execute-amiga` script used below can be downloaded from [here](https://raw.githubusercontent.com/sebastianbergmann/docker-execute-amiga/master/docker-execute-amiga.sh).
|
The `docker-execute-amiga` script used below can be downloaded from [here](https://raw.githubusercontent.com/sebastianbergmann/docker-execute-amiga/master/docker-execute-amiga.sh).
|
||||||
|
|
||||||
|
@ -71,10 +71,10 @@ $ docker-execute-amiga helloworld
|
||||||
![Screenshot](screenshot.png)
|
![Screenshot](screenshot.png)
|
||||||
|
|
||||||
|
|
||||||
#### Docker-ized Emulation using Virtual AmigaOS (vamos)
|
#### Container-ized Emulation using Virtual AmigaOS (vamos)
|
||||||
|
|
||||||
```
|
```
|
||||||
$ docker run -v $HOME:/host sebastianbergmann/amitools:latest \
|
$ podman run -v $HOME:/host sebastianbergmann/amitools:latest \
|
||||||
vamos -C 68020 /host/hello
|
vamos -C 68020 /host/hello
|
||||||
Hello world!
|
Hello world!
|
||||||
```
|
```
|
||||||
|
|
|
@ -1,12 +1,9 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project name="docker-amiga-gcc" default="build">
|
<project name="docker-amiga-gcc" default="build">
|
||||||
<!-- Set this to "docker" if you have/want to use Docker instead of Podman -->
|
|
||||||
<property name="docker-command" value="podman"/>
|
|
||||||
|
|
||||||
<property name="test-directory" value="/tmp/docker-amiga-gcc-test"/>
|
<property name="test-directory" value="/tmp/docker-amiga-gcc-test"/>
|
||||||
|
|
||||||
<target name="build">
|
<target name="build">
|
||||||
<exec executable="${docker-command}" taskname="image-build">
|
<exec executable="podman" taskname="image-build">
|
||||||
<arg value="build"/>
|
<arg value="build"/>
|
||||||
<arg value="--pull"/>
|
<arg value="--pull"/>
|
||||||
<arg value="--no-cache"/>
|
<arg value="--no-cache"/>
|
||||||
|
@ -20,7 +17,7 @@
|
||||||
<mkdir dir="${test-directory}"/>
|
<mkdir dir="${test-directory}"/>
|
||||||
<copy file="${basedir}/test/hello.c" todir="${test-directory}"/>
|
<copy file="${basedir}/test/hello.c" todir="${test-directory}"/>
|
||||||
|
|
||||||
<exec executable="${docker-command}" taskname="test-compile">
|
<exec executable="podman" taskname="test-compile">
|
||||||
<arg value="run"/>
|
<arg value="run"/>
|
||||||
<arg value="--rm"/>
|
<arg value="--rm"/>
|
||||||
<arg value="--volume"/>
|
<arg value="--volume"/>
|
||||||
|
@ -33,7 +30,7 @@
|
||||||
<arg value="-noixemul"/>
|
<arg value="-noixemul"/>
|
||||||
</exec>
|
</exec>
|
||||||
|
|
||||||
<exec executable="${docker-command}" taskname="test-execute" outputproperty="hello.c">
|
<exec executable="podman" taskname="test-execute" outputproperty="hello.c">
|
||||||
<arg value="run"/>
|
<arg value="run"/>
|
||||||
<arg value="--rm"/>
|
<arg value="--rm"/>
|
||||||
<arg value="--volume"/>
|
<arg value="--volume"/>
|
||||||
|
|
Loading…
Reference in New Issue