Skip to content

Commit

Permalink
Tidy
Browse files Browse the repository at this point in the history
  • Loading branch information
willend committed Sep 8, 2023
1 parent 66b5f5a commit 1fbb627
Show file tree
Hide file tree
Showing 44 changed files with 2 additions and 1,176 deletions.
45 changes: 2 additions & 43 deletions Docker/README.md
Original file line number Diff line number Diff line change
@@ -1,44 +1,3 @@
# This document describes the efforts towards providing McXtrace and McStas as docker images.
In the following:
- FLAVOUR is either 'mcstas' or 'mcxtrace' in small letters unless otherwise noted.
- VERSION is the version of McStas/McXtrace, eg. 2.6.1, or 1.5
- IMAGEVERSION is the version number of the docker image - i.e. not the program version.
# Removed from McStas/McXtrace repo

# To build a new image:
```docker image build --tag mccode/FLAVOUR-VERSION:IMAGEVERSION .```
The punctuation mark at the end, is necessary to tell docker where to find the
\'Dockerfile\'

# To push the image to dockerhub:
```docker image push mccode/FLAVOUR-VERSION:IMAGEVERSION```

## The McXtrace debian based docker on Linux / macOS:
Simply run the script ```docker_mxgui.sh```, this will pull an image from dockerhub and cache it locally.

## The McXtrace debian based docker on Windows:
Simply run the script ```docker_mxgui.bat```, this will pull an image from dockerhub and cache it locally.

## The McStas debian based docker on Linux /macOS:
Simply run the script ```docker_mcgui.sh```, this will pull an image from dockerhub and cache it locally.

## The McStas debian based docker on Windows:
Simply run the script ```docker_mcgui.bat```, this will pull an image from dockerhub and cache it locally.

**In both cases:**
- You will run as the user "docker" inside the docker.
- Mounts the users home directory as the home directory for the docker run.

# On Linux you will also need
- To [install Docker for your variant of Linux](https://docs.docker.com/engine/install/#server)

# On macOS you will also need
- To install [Docker Desktop for macOS](https://docs.docker.com/docker-for-mac/install/)
- To install [XQuartz](https://www.xquartz.org)
- Use the [XQuartz preferences](https://raw.githubusercontent.com/McStasMcXtrace/McCode/master/Docker/images/XQuartz-prefs.png) pane to ["Allow connections from network clients"](https://raw.githubusercontent.com/McStasMcXtrace/McCode/master/Docker/images/Allow-connections-from-network-clients.png)

# On windows you will also need
- To install [Docker Desktop](https://docs.docker.com/docker-for-windows/install/)
- To install [Xming](https://sourceforge.net/projects/xming/files/latest/download)
- Create the subfolder McXtrace-dockers and / or McStas-dockers in
your homedir
- Set your [user homedir/the above folder](https://raw.githubusercontent.com/McStasMcXtrace/McCode/master/Docker/images/Docker-resources-file-sharing.png) among the docker shared folders
Please refer to https://github.com/McStasMcXtrace/mcstas-binder and https://github.com/McStasMcXtrace/mcxtrace-binder
17 changes: 0 additions & 17 deletions Docker/common/Dockerfile

This file was deleted.

5 changes: 0 additions & 5 deletions Docker/common/build.sh

This file was deleted.

13 changes: 0 additions & 13 deletions Docker/common/runme.sh

This file was deleted.

Binary file not shown.
Binary file removed Docker/images/Docker-resources-file-sharing.png
Binary file not shown.
Binary file removed Docker/images/XQuartz-prefs.png
Binary file not shown.
18 changes: 0 additions & 18 deletions Docker/mcstas/3.0-fat-with-nvhpc/Dockerfile

This file was deleted.

5 changes: 0 additions & 5 deletions Docker/mcstas/3.0-fat-with-nvhpc/build.sh

This file was deleted.

1 change: 0 additions & 1 deletion Docker/mcstas/3.0-fat-with-nvhpc/docker_mcgui.bat

This file was deleted.

23 changes: 0 additions & 23 deletions Docker/mcstas/3.0-fat-with-nvhpc/docker_mcgui.sh

This file was deleted.

23 changes: 0 additions & 23 deletions Docker/mcstas/3.0-fat-with-nvhpc/docker_mcgui_gpu.sh

This file was deleted.

1 change: 0 additions & 1 deletion Docker/mcstas/3.0-fat-with-nvhpc/docker_mcstas-shell.bat

This file was deleted.

23 changes: 0 additions & 23 deletions Docker/mcstas/3.0-fat-with-nvhpc/docker_mcstas-shell.sh

This file was deleted.

23 changes: 0 additions & 23 deletions Docker/mcstas/3.0-fat-with-nvhpc/docker_mcstas-shell_gpu.sh

This file was deleted.

18 changes: 0 additions & 18 deletions Docker/mcstas/fat-with-nexus/Dockerfile

This file was deleted.

5 changes: 0 additions & 5 deletions Docker/mcstas/fat-with-nexus/build.sh

This file was deleted.

1 change: 0 additions & 1 deletion Docker/mcstas/fat-with-nexus/docker_mcgui.bat

This file was deleted.

23 changes: 0 additions & 23 deletions Docker/mcstas/fat-with-nexus/docker_mcgui.sh

This file was deleted.

1 change: 0 additions & 1 deletion Docker/mcstas/fat-with-nexus/docker_mcstas-shell.bat

This file was deleted.

23 changes: 0 additions & 23 deletions Docker/mcstas/fat-with-nexus/docker_mcstas-shell.sh

This file was deleted.

22 changes: 0 additions & 22 deletions Docker/mcstas/mcstasscript/Dockerfile

This file was deleted.

36 changes: 0 additions & 36 deletions Docker/mcstas/mcstasscript/Dockerfile.podman

This file was deleted.

Loading

0 comments on commit 1fbb627

Please sign in to comment.