-
Notifications
You must be signed in to change notification settings - Fork 119
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
jpfleischer
wants to merge
58
commits into
e-mission:master
Choose a base branch
from
jpfleischer:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
58 commits
Select commit
Hold shift + click to select a range
acf7f3e
Typo Fix
TeachMeTW 553a45d
Added Func Time Collection?
TeachMeTW d19392d
Fixed per feedback, removed decorator
TeachMeTW 593e61c
Merge pull request #987 from shankari/fix_push_again
shankari 05bac58
Update emission/storage/decorations/stats_queries.py
TeachMeTW e23d4b6
Update emission/storage/decorations/stats_queries.py
TeachMeTW 7fc3f81
Update emission/storage/decorations/stats_queries.py
TeachMeTW e7e50da
Update emission/storage/timeseries/builtin_timeseries.py
TeachMeTW dd253dd
Update emission/storage/decorations/stats_queries.py
TeachMeTW 8957a06
Review Changes
TeachMeTW f428069
Changes
TeachMeTW 4f636a9
Reverted some
TeachMeTW b2e3cb5
Added verification
TeachMeTW a1ff54e
resolve
TeachMeTW 12d5e86
Fixed whitespace commits
TeachMeTW cf5b5a1
Removed unused imports
TeachMeTW 2b5cefd
Removed unused imports
TeachMeTW 5ac74fa
Delete miniconda.sh
TeachMeTW 64cfc3f
Removed unnecessary
TeachMeTW a7884e5
Merge branch 'feature/stats_timing' of https://github.com/TeachMeTW/e…
TeachMeTW 196e410
Timeseries
TeachMeTW fc3f0ee
Used TimeSeries Interface and made it so _get_query accepts dict and …
TeachMeTW d02f186
Used get entry at ts
TeachMeTW b6bb6b9
Refactor
TeachMeTW bc9f638
Turned into unit test
TeachMeTW f814102
Wrong comment
TeachMeTW 5066c85
Update .gitignore
TeachMeTW 9996707
Update emission/tests/funcTests/TestFunctionTiming.py
TeachMeTW fed4964
Update emission/storage/decorations/stats_queries.py
TeachMeTW 09f93df
remvoed whitespace
TeachMeTW 9c418c8
Used find_entries
TeachMeTW 5ba94d7
Jack Changes
TeachMeTW 7f12f67
Reverts
TeachMeTW 4c7b80b
Reverted Non_user
TeachMeTW e843169
Added more tests
TeachMeTW 9f9ec9e
Update emission/tests/funcTests/TestFunctionTiming.py
TeachMeTW d76f63a
Update emission/tests/funcTests/TestFunctionTiming.py
TeachMeTW f5b07a4
Implemented Review Changes
TeachMeTW a24b03b
simplify tests for store_dashboard_time / store_dashboard_error
JGreenlee 39f763d
move TestFunctionTiming -> TestStatsQueries
JGreenlee 1bdc922
Merge pull request #1 from JGreenlee/simpler_stats_timing
TeachMeTW db1e7bb
Added comments and changed param
TeachMeTW 0b39803
Toned back comments
TeachMeTW 1551a30
Merge pull request #986 from TeachMeTW/feature/stats_timing
shankari a9331d5
Enable support for Apple silicon chip
jpfleischer 68b5fb5
Merge branch 'master' of https://github.com/jpfleischer/e-mission-server
jpfleischer 9211c61
see what the platforms are
jpfleischer c1482f4
Test docker build workflow
jpfleischer f337883
Get rid of colima
jpfleischer 7277364
Add colima back
jpfleischer 3304752
Automate docker install
jpfleischer 9aeb37a
Troubleshoot docker
jpfleischer 618aea1
Add homebrew
jpfleischer 095ddf0
Revert to docker successfully installing
jpfleischer db9713a
fix colima
jpfleischer 478482c
debug ubuntu arm
jpfleischer f1bbd2c
Return working setup_config.sh
jpfleischer ab65b89
Undo arm ubuntu runner. It is paid only.
jpfleischer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 . |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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
There was a problem hiding this comment. Choose a reason for hiding this commentThe 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. |
||
- 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: ## | ||
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
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:
https://github.com/e-mission/e-mission-server/blob/master/.github/workflows/osx-ubuntu-manual-install.yml
https://github.com/e-mission/e-mission-server/actions/workflows/osx-ubuntu-manual-install.yml
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.