Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Dockerfile to work on Silicon chip #989

Open
wants to merge 58 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
acf7f3e
Typo Fix
TeachMeTW Oct 2, 2024
553a45d
Added Func Time Collection?
TeachMeTW Oct 4, 2024
d19392d
Fixed per feedback, removed decorator
TeachMeTW Oct 5, 2024
593e61c
Merge pull request #987 from shankari/fix_push_again
shankari Oct 6, 2024
05bac58
Update emission/storage/decorations/stats_queries.py
TeachMeTW Oct 12, 2024
e23d4b6
Update emission/storage/decorations/stats_queries.py
TeachMeTW Oct 12, 2024
7fc3f81
Update emission/storage/decorations/stats_queries.py
TeachMeTW Oct 12, 2024
e7e50da
Update emission/storage/timeseries/builtin_timeseries.py
TeachMeTW Oct 12, 2024
dd253dd
Update emission/storage/decorations/stats_queries.py
TeachMeTW Oct 12, 2024
8957a06
Review Changes
TeachMeTW Oct 12, 2024
f428069
Changes
TeachMeTW Oct 13, 2024
4f636a9
Reverted some
TeachMeTW Oct 14, 2024
b2e3cb5
Added verification
TeachMeTW Oct 14, 2024
a1ff54e
resolve
TeachMeTW Oct 14, 2024
12d5e86
Fixed whitespace commits
TeachMeTW Oct 14, 2024
cf5b5a1
Removed unused imports
TeachMeTW Oct 14, 2024
2b5cefd
Removed unused imports
TeachMeTW Oct 14, 2024
5ac74fa
Delete miniconda.sh
TeachMeTW Oct 14, 2024
64cfc3f
Removed unnecessary
TeachMeTW Oct 14, 2024
a7884e5
Merge branch 'feature/stats_timing' of https://github.com/TeachMeTW/e…
TeachMeTW Oct 14, 2024
196e410
Timeseries
TeachMeTW Oct 14, 2024
fc3f0ee
Used TimeSeries Interface and made it so _get_query accepts dict and …
TeachMeTW Oct 15, 2024
d02f186
Used get entry at ts
TeachMeTW Oct 15, 2024
b6bb6b9
Refactor
TeachMeTW Oct 15, 2024
bc9f638
Turned into unit test
TeachMeTW Oct 15, 2024
f814102
Wrong comment
TeachMeTW Oct 15, 2024
5066c85
Update .gitignore
TeachMeTW Oct 15, 2024
9996707
Update emission/tests/funcTests/TestFunctionTiming.py
TeachMeTW Oct 15, 2024
fed4964
Update emission/storage/decorations/stats_queries.py
TeachMeTW Oct 15, 2024
09f93df
remvoed whitespace
TeachMeTW Oct 15, 2024
9c418c8
Used find_entries
TeachMeTW Oct 15, 2024
5ba94d7
Jack Changes
TeachMeTW Oct 15, 2024
7f12f67
Reverts
TeachMeTW Oct 16, 2024
4c7b80b
Reverted Non_user
TeachMeTW Oct 16, 2024
e843169
Added more tests
TeachMeTW Oct 16, 2024
9f9ec9e
Update emission/tests/funcTests/TestFunctionTiming.py
TeachMeTW Oct 16, 2024
d76f63a
Update emission/tests/funcTests/TestFunctionTiming.py
TeachMeTW Oct 16, 2024
f5b07a4
Implemented Review Changes
TeachMeTW Oct 16, 2024
a24b03b
simplify tests for store_dashboard_time / store_dashboard_error
JGreenlee Oct 17, 2024
39f763d
move TestFunctionTiming -> TestStatsQueries
JGreenlee Oct 17, 2024
1bdc922
Merge pull request #1 from JGreenlee/simpler_stats_timing
TeachMeTW Oct 17, 2024
db1e7bb
Added comments and changed param
TeachMeTW Oct 17, 2024
0b39803
Toned back comments
TeachMeTW Oct 18, 2024
1551a30
Merge pull request #986 from TeachMeTW/feature/stats_timing
shankari Oct 18, 2024
a9331d5
Enable support for Apple silicon chip
jpfleischer Oct 18, 2024
68b5fb5
Merge branch 'master' of https://github.com/jpfleischer/e-mission-server
jpfleischer Oct 18, 2024
9211c61
see what the platforms are
jpfleischer Oct 19, 2024
c1482f4
Test docker build workflow
jpfleischer Oct 19, 2024
f337883
Get rid of colima
jpfleischer Oct 19, 2024
7277364
Add colima back
jpfleischer Oct 19, 2024
3304752
Automate docker install
jpfleischer Oct 19, 2024
9aeb37a
Troubleshoot docker
jpfleischer Oct 19, 2024
618aea1
Add homebrew
jpfleischer Oct 19, 2024
095ddf0
Revert to docker successfully installing
jpfleischer Oct 19, 2024
db9713a
fix colima
jpfleischer Oct 19, 2024
478482c
debug ubuntu arm
jpfleischer Oct 19, 2024
f1bbd2c
Return working setup_config.sh
jpfleischer Oct 19, 2024
ab65b89
Undo arm ubuntu runner. It is paid only.
jpfleischer Oct 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions .docker/setup_config.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,15 @@
set -e
echo "About to start conda update, this may take some time..."
source setup/setup_conda.sh Linux-x86_64
ARCH=$(uname -m)
if [ "$ARCH" == "x86_64" ]; then
source setup/setup_conda.sh Linux-x86_64
elif [ "$ARCH" == "aarch64" ]; then
source setup/setup_conda.sh Linux-aarch64
else
echo "Unsupported architecture: $ARCH"
exit 1
fi

Comment on lines +3 to +12
Copy link
Contributor

@shankari shankari Oct 19, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am very skeptical that this is actually broken:

Screenshot 2024-10-18 at 5 32 18 PM Screenshot 2024-10-18 at 5 34 00 PM

Before I review this further, I would like some additional detailed evidence that this is actually broken and not just an error in your installation.

# now install the emission environment
source setup/setup.sh

Expand Down Expand Up @@ -54,4 +63,4 @@ else
NEW="run(reloader=True,host=server_host"
echo "Replacing $ORIG -> $NEW"
sed -i -e "s|$ORIG|$NEW|g" emission/net/api/cfc_webapp.py
fi
fi
60 changes: 60 additions & 0 deletions .github/workflows/dockerbuild.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
name: docker-build

# Controls when the action will run. Triggers the workflow on push or pull request
# events but only for the master branch
on:
push:
branches:
- master
- gis-based-mode-detection
pull_request:
branches:
- master
- gis-based-mode-detection
schedule:
# * is a special character in YAML so you have to quote this string
- cron: '5 4 * * 0'


jobs:
# This workflow contains a single job called "build"
build:
# The type of runner that the job will run on
runs-on: ${{ matrix.os }}
strategy:
matrix:
os: [ubuntu-latest, macos-latest]
include:
- os: macos-latest
PLATFORM: MacOSX-x86_64
- os: ubuntu-latest
PLATFORM: Linux-x86_64

# Steps represent a sequence of tasks that will be executed as part of the job
steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

- name: check my platform
shell: bash -l {0}
run: |
uname -a
uname -m

- name: Setup docker, docker-compose, and colima (missing on MacOS)
if: runner.os == 'macos'
run: |
brew install docker docker-compose colima

# Link the Docker Compose v2 plugin so it's understood by the docker CLI
mkdir -p ~/.docker/cli-plugins
ln -sfn /usr/local/opt/docker-compose/bin/docker-compose ~/.docker/cli-plugins/docker-compose

LIMACTL_PATH=$(brew --prefix)/bin/limactl
sudo curl -L -o $LIMACTL_PATH https://github.com/mikekazakov/lima-nohvf/raw/master/limactl && sudo chmod +x $LIMACTL_PATH
colima start --network-address --arch arm64 --vm-type=qemu

- name: try doing docker build
shell: bash -l {0}
run: |
docker build -t emission-server .
6 changes: 6 additions & 0 deletions .github/workflows/osx-ubuntu-manual-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ jobs:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2

- name: check my platform
shell: bash -l {0}
run: |
uname -a
uname -m

- name: Install miniconda
shell: bash -l {0}
run: |
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,12 @@ preprocessing results ensures reasonable performance.

## Installation: ##
----------
- For **deployers** (i.e. if you want to primarily *use* the system as opposed to modify/develop it, the [docker installation](https://github.com/e-mission/e-mission-docker) is probably the easiest way to get started.
- For **deployers** i.e. if you want to primarily *use* the system as opposed to modify/develop it,

```bash
docker build -t e-mission-server .
```

Comment on lines +26 to +31
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am also not sure why you are building this container instead of using one of the pre-built images. We build an image on every commit to master.
https://github.com/e-mission/e-mission-server/actions/workflows/image_build_push.yml

- For **builders** (i.e. if you want to write new scripts or modify existing scripts) the [manual install](https://github.com/e-mission/e-mission-docs/blob/master/docs/install/manual_install.md) will make it easier to edit files directly on your local filesystem. Make sure to use a POSIX-compliant CLI; you may want to look into [gitbash](https://openhatch.org/missions/windows-setup/install-git-bash) or similar on Windows.

## Additional Documentation: ##
Expand Down
Loading